pep8 cleanup
Support retries