[TIMOB-14936] Code Refactor