Pep8

Cleanup of PEP8 (plus don't panic when we succeed)