Refactoring part of language files