Few bits of tidying.