Sonar fixes

Jan-Tarek Buttrequested to merge
sonar-fixes into development

This MR shall fix the listed sonarqube issues.

Edited by Jan-Tarek Butt

Merge request reports