pep8 fixes to make ./check.py pass