Refactored duplication in message methods