Some pep8 stylistic changes