[task] refactoring code through suggestions from SONAR
Merge pull request #83 from davidmoebius/sonar

[task] refactoring code through suggestions from SONAR