Correct some pep8 ugliness