cleaning up some loops in Indexer