code style simplify
code style simplify
fix testing fail
Merge pull request #701 from fuxiaohei/develop

code style simplify