Convert to PEP8