A little more tidying.