refactor control message forming
2 files changed