Small changes. Mainly tidying things up.