Formatting changes

#1908