More uncrustify changes