Cleanup/exercise basic

Merged Theresa Schollenberger requested to merge cleanup/exercise-basic into master

Merge request reports