More formatting changes 2