cleaning up some of the messiest classes