tidying up
more tidying