Refactoring Language Files Last Part