A small amount of tidying up