re #10712 Corrected whole file formatting, as partial format look bad