Reduce more mess in all classes.