renaming classes and cleaning up