cleaned up some variable names

hopefully makes a little more sense now