Apply suggestions from code review

Commit

5 years ago

Apply suggestions from code review Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>