[TIMOB-15441] Refactor