Cleading up models.py