cleaned up the classes