Minor extra tidying