Code refactoring
Merge pull request #30 from piotrglazar/feature/sonar-fixes

Code refactoring