Clean up some variable names