Some more tidying