Made some changes according to pep8 convention.