Revert "Formatting tweaks"

This reverts commit d5cbdf2931c0fa2b4ce256fef1174367aefb9e89.
Revert "Revert "Formatting tweaks""

This reverts commit b76bb7344e6546cb0121e24125444d4e0580145d.