Language var refactoring