cleaned up some variable names