tidying up some more