Minor pep8 improvements