cleanup utilities a bit