Much cleaner (21/26)

Much cleaner