Cleaned up the code and changed the names of the classes