Simplified the flow through the message parser