Much cleaner (15/26)

Much cleaner