localization refactoring