Add braces around single-line statements
Fix comment indentation

This needs at least uncrustify 0.60 to work.