More formatting changes 4