cleaned up some of the classes