More pep8 formatting cleanup