cleaned up model classes