Refactor and clean up

Merged Olaf Mersmann requested to merge feat_cleanup into develop

Merge request reports