Much more cleaner (16/26)

Much more cleaner