Pep8 fixes

Just like #983, this adds nothing, just makes the code more PEP-8 compliant.