misc: more code cleanup

A little more cleaning. I uncrustified them all.