[TIMOB-14563] Code refactor