Apply suggestions from code review

Co-authored-by: Jeremy Fiel <32110157+jeremyfiel@users.noreply.github.com>