Bit of tidying things up.