Much cleaner (14/26)

Much cleaner