Minor tidying up

Minor tidying