more refactoring of processing index entries and adding javadocs