More general formatting changes.