[TIMOB-14103] Code Refactor