refactor indice_calculator