tidying up some things