A few bits of tidying up