Fixing issues in Sonar report
Merge pull request #4 from futures/sonar-fixes

Fixing issues in Sonar report