more tidying!