Further pep8 fixes