Draft: Resolve "Tidy up"

Closed Manuel Schrauth requested to merge 2-tidy-up into master

Closes #2 (closed)

Merge request reports