more low-risk pep8 cleanups