Further work tidying up