Refactor user index