Small reformatting improvements