Remove semicolons, add braces on ctrl flow stmts