cleaning some bugs with variable naming