whitespace/braces cleanup