Small cleanup
Refactored index data structure.