WIP: Refactoring

Closed Janine Leona Schleicher requested to merge Refactoring into master

Merge request reports