Refactorign of CISI TP4