Improve the first exercise.