Variable Refactoring and global renaming