A little more tidying...