I18n refactoring