First pass at cleaning up some of the exercises.