[TIMOB-17238] Addressed comments in PR