Apply suggestions from code review

Commit

331 days ago

Apply suggestions from code review Co-authored-by: Nathan Habib <30601243+NathanHB@users.noreply.github.com>