Some more format changes