bunch of pep8 cleanup