clean up some of this code