tidied up m_relay.c