major code reformat to a standard format
Merge branch 'hotfix/formatCode'