Much more cleaner (25/26)

Much more cleaner