localization & refactoring