[TIMOB-13901] Code Refactor