Refactor message content and format