Language refactoring