Refactor Node Indexes