Much more cleaner (23/26)

Much more cleaner