Conform more closely to pep8