Formatting changes per #3134 review