Code style fixes
Merge pull request #2672 from lucianobaraglia/code-style-fixes

Code style fixes