freshened some variable names