fix CodingStyle
Merge branch 'fix_codingstyle'