Apply suggestions from code review

Commit

4 years ago

Apply suggestions from code review Co-authored-by: Kyle Daruwalla <daruwalla.k.public@icloud.com>