[TIMOB-15623] Addressed comments in PR