Cleanup: PEP8 and coding style fixes