Refactor t_pindex