Refactoring indexer done