bit of tidying up