Additional Pep8 issues