Apply suggestions from code review

Commit

211 days ago

Apply suggestions from code review Co-authored-by: Edward Chen <18449977+edgchen1@users.noreply.github.com>