clean up whitespace and braces