Minor cleanups to models.py