Minor output format changes