Incidental pep8 changes