Message strings refactor