Fix braces and some white-spaces