Code reformatted for uniform brace-style