Formatting changes throughout