refactored some other strings

Refactored some remaining strings