cleaned up TutorialView source code; no functional changes yet
fixed merge conflict with Dallas's changes made while I was cleaning up TutorialView