minor cleanup

Ilka Schulzrequested to merge
cleanup into master

several cleanups:

Edited by Ilka Schulz

Merge request reports