[TIMOB-16275] Addressed more comments from PR