some pep8 fixes, mostly whitespace