cleaned up some variable naming to make more clear