refactoring locales and section