This is my Tidy up of the classes