change some variable names for clarity