trivial refactoring
pep8 spacing fixes