Fix some coding standards
Merge branch 'develop'

* develop:
  Fix some coding standards