Refactoring variables