Smaller changes to exercise-basic

Merged Stefanie Kiemle requested to merge cleanup/exercise_basic into master

Merge request reports