Apply suggestions from code review

Commit

6 years ago

Apply suggestions from code review Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>