Sonar fixes
Merge pull request #25 from futures/SonarFixes

Sonar fixes