this continues on some of my earlier formatting changes.

you can read #53748 for my arguments why single indent is better.