Reformatted, fixing curly braces and white space