whitespace/braces cleanup part two