Cleanup/basic exercise

Ivan Bunticrequested to merge
cleanup/basic-exercise into master

Last minute improvements for basic exercise.

Merge request reports