Some changes according PEP8 python style guide