Fixes for uncrustify config

Fixed line width and some spaces, also remove braces for single line if statements.

Problems are discussed in #680