Refactoring of variables