pep8/pyflakes fixups