Refactoring Index Module