updated models.py references
removed git comments
Adding changes from meeting with Nate