Start fixing code style
Merge pull request #2827 from wilsonge/patch-6

Codestyle