A little tidying