Minor PEP8 cleanups