cleaning up model class