Some more tidying up.