tidying up some