Tidy up model classes.