Various formatting changes