Refactor indexing code
Merge refactor branch