pep8/flake8 cleanup