More trivial pep8 fixes