cleaned up models.py