Code style changes according to PEP8