Tidying up ex1.8