Updates in response to review
Branch: celery-doc