Some pep8 work