Formatting changes for both