Cleanup: PEP8