Apply suggestions from code review

Commit

247 days ago

Apply suggestions from code review Co-authored-by: Steven Liu <59462357+stevhliu@users.noreply.github.com>