Some more tidying up