Some changes to conform PEP8 guideline