More final formatting changes