Apply suggestions from code review

Commit

3 years ago

Apply suggestions from code review Co-authored-by: Ayush Kamat <34531970+ayushkamat@users.noreply.github.com>