clean-up of models.py