Apply suggestions from code review

Commit

2 years ago

Apply suggestions from code review Co-authored-by: Marc Sun <57196510+SunMarc@users.noreply.github.com>