Much more cleaner (24/26)

Much more cleaner