Cleanup/exercise basic

Theresa Schollenberger requested to merge cleanup/exercise-basic into master Jul 13, 2018