Adapt to PEP8