[TIMOB-15577] Addressed comments in PR