some changes according to PEP8