Cleanup: PEP8 fixes