[fix] fix of SONAR Problems
formatted code
[fix] additional SONAR fixes
Merge pull request #79 from davidmoebius/sonarfix

Sonarfix