[TIMOB-10824] Code refactor