Outside the scope of this refactor, and not asking you to change it in this PR, but consider using I18n later to organize these kind of messages.