Much more cleaner (20/26)

Much more cleaner