Indexing feature, initial version
Cleanup.