Add some flake8/pep8 corrections