lots of tidying