Additional pep8 related fixes