Refactor - MessageSender