Style fixes (brace style and some newlines)