Reformat according to new formatting preferences
Simplified rounding a tiny bit