Yet more minor format changes