Refactoring continued: named var -> base var renaming