indexer refac