Refactoring Mailbox