some whitespace/indent changes to please pep8