Tidy up of classes