Bit of tidying