Another couple of pep8 fixes