Code formatting changes from 9234
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>