Minor tidying uo