fix style
Merge branch 'release/fix_style'