tidying up
tidying up some more