More formatting changes 3