Moved the api response state update to the correct location, some comment cleanup.

12 jobs for v1-archive-fixes in 27 minutes and 41 seconds (queued for 2 seconds)