Integrate Gordon Sim's PEP8 cleanups