bcwaldon: pep8 fixes