Fix braces and a few whitespaces