Apply suggestions from code review

Commit

68 days ago

Apply suggestions from code review Co-authored-by: bagheera <59658056+bghira@users.noreply.github.com>