Refactor Mailbox