Change protocol and remove unnecessary comment