cleaning up some variable names