Locale refactoring