More pep8 fixes found by flake8