Factor out message loop

[Stateford]

The current message loop is too long and too complex. It should be factored out into smaller functions / loops.