Restored the one true brace style (mass reformat commit)