Apply suggestions from code review

Commit

7 years ago

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