trivial refactoring
pep8 spacing fixes
Merge pull request #5523 from hulu/pep8-more

another batch of pep8 fixes