update the comments according to RFC 7231 too