Refactoring Mailbox.cs