fixing sonar violations
Merge pull request #24 from tkrille/fixing_sonar

fixing sonar violations