pep8 cleanup round 1