Cleaning up models.py