PEP8 Cleanups