Modify for PEP8