More pep8 changes