Reformat, no functional changes