#3705 formatting changes