Bit more tidying up