pep8/flake8 fixes