Tidied some things up prior to a review.