a bit more tidying still