Tidying up in anticipation of review.