Adding comments, moving iteration cleanup after status dump.