Bit more tidying...