Much more cleaner (19/26)

Much more cleaner