Minor tidying...