relay: some cleanups and change the way mentioning is done