Tidy up classes