Update to latest from pep8