cleaning up classes so they make more sense