tidying up for publication