Comments and cleanup to relay-stream.