Refactoring locale model