reformat part 1
reformat code
Merge branch 'master' into Cache