do a bit more tidying