Merge "First step in refactoring Index.java"