Refactor index
Refactor