[#60746198] further refactoring

driving towards a better Iterate