improve some variable names