Cleaned up the message retreiver a little bit.