Refactoring (renamed variables)