Much more cleaner (15/26)

Much more cleaner