Some Code style fixes
Missing codestyle fix
Merge pull request #2061 from lucianobaraglia/some-codestyle-fixes

Some codestyle fixes