More refactoring and method index parser.