Apply suggestions from code review

Commit

2 years ago

Apply suggestions from code review Co-authored-by: Mihir Patel <mihir.v.patel7@gmail.com>