Minor pep8 and pep257 changes