Reformat some source for ICU