fixed linewith and some spaces, also remove braces for single line if statements
Merge pull request #685 from sappo/master

Fixes for uncrustify config