Much more cleaner (18/26)

Much more cleaner