Formatting for #2066