[TIMOB-17663] Code Refactor