Clarify variable names and avoid name shadowing.