more fixes
uncrustify