Refactor Index pg cont.