small refactoring and use of localized string instead of hardcoded