Extract a new method, clarify variable names.