Refactor lang files