Some code style fixes [skip ci]
Merge pull request #1940 from lucianobaraglia/some-cs-fixes

Some code style fixes [skip ci]