first pass at pep8 cleanup