Lot more changes according to pep8 convention.