reformat part 1
reformat code