Style cleanup
The one true brace style