PEP-8 cleanups