Additional pep8 work