a bit of tidying up