Minor variable renaming for clarity