worked on making the classes more organized