fix inline control structures, reformat