Indexer delete tested
Refactoring