Misc formatting changes.