Apply suggestions from code review

Commit

6 years ago

Apply suggestions from code review Co-Authored-By: David Baker <dbkr@users.noreply.github.com>