Bit more tidying