Various code cleanup sonar fixes#105

Hilbrand merged 2 commits intoaerius:mainaerius/taskmanager:mainfrom

Hilbrand:sonar-fixesHilbrand/aerius-taskmanager:sonar-fixesCopy head branch name to clipboard