[TIMOB-14221] Refactor