Minor tidying