More formatting changes, sigh