Make code beautify
Merge branch 'SidneyFan' into version3.0