Apply suggestions from code review

Commit

42 days ago

Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>