Cleaning up some variable names