Fix pep8 issues again