fix CodingStyle
Merge branch 'fix_style'