lots of pep8 fixups