More formatting changes, onto next bit