tidying up
Mailbox attempt #1