Fix some pyflakes/pep8 warnings.
Review Request #1192 — Created April 26, 2018 and submitted
This fixes up some trivial issues that were causing Review Bot to freak out. Testing done: - Ran pyflakes and pep8 - Ran unit tests
pyFlakes failed during my test.