Some code style fixes
Merge pull request #1 from gusson/style_changes

Some code style fixes