refactoring and locales
refactoring and locales