more pep8/pyflakes issues