Feature/sonarqube improvements

Resolve some issues that were raised in SonarQube. Most of them bogus, but some good suggestions as well

requested review from @mohammad.torkashvand

assigned to @karel.vanklink

approved this merge request

merged