Refactor SenderShell