relayId and remoteId server's support amemdments, coding style fix