PEP8 and readability improvements to models.py