Much more cleaner (21/26)

Much more cleaner