STY pep8
STY pep8
WIP toward getting flake8 to pass; Merge branch 'pep8'