[TIMOB-2710] Addressed comments in PR