#1769 refactoring some strings