tidy bit of tidying up