Cleaned up some code in models.py so it looks more organized and it's easier to read