Change some variable names for clarity