Chnaged code according to pep8