Fix various violations reported by sonar that could be trivially fixed.
Merge pull request #249 from agueganno/violations-fix

Fix various violations reported by sonar that could be trivially fixed.