More stylistic changes for pep8