Much more cleaner (22/26)

Much more cleaner