Much cleaner (18/26)

Much cleaner