Code is changed according to pep8