a bit of tidying