Improve exercise one, and comments on exercise two