A little more tidying