Finishing exercise 1.8