Some minor format changes