Some more tidying!