Much cleaner (16/26)

Much cleaner