Initial code reformat (with auto tool)