Small code cleanup

Armin Felder requested to merge smallCodeCleanup into master

Merge request reports