more fixes for stuff found by pep8.py