Apply suggestions from code review

Commit

3 years ago

Apply suggestions from code review Co-authored-by: Andrew Yang <36414270+erdOne@users.noreply.github.com>