Formatting changes for merge