Improves some variable names