Minor code compliance changes
Ran uncrustify