Tidying up from review.