Apply suggestions from code review

Commit

5 years ago

Apply suggestions from code review Co-Authored-By: Travis Ralston <travpc@gmail.com>