cleaned up some classes