CON-554: Formatting changes