Further formatting changes