cleaned up some variables