Much cleaner (22/26)

Much cleaner