locales refactoring