Changes according to PEP8