Language variable refactoring