Bit more tidying.