minor refactor of zmq model