A little more tidying up.