style changes per uncrustify