Improve some variable names