tidying up some stuff