Final formatting changes