pep8 improvements.