STY: Pep 8 cleanup
Merge pull request #1368 from jseabold/model-pep8

STY: Pep 8 cleanup