cleanup

Ramon Nourequested to merge
cleanup into master

Reduce some repetitive code

Merge request reports