starting cleanup on model class