Variable refactorization