variable refactoring