Improves class setting, piecewise cleaned management