last bits of tidying