More Pep8 issues