Minor tidying-up