code style simplify
Merge pull request #687 from fuxiaohei/develop

code style simplify