STY: Pep-8 cleanup.
Merge pull request #1346 from jseabold/pep8cleanup

STY: PEP-8 Cleanup