models.py cleanup