(ReindexAll) Changing format of iterateAll + other review changes