Review and changes from Jocelyn Fiat

maybe I can improve that on the HTTP_HEADER directly. For now, just ignore this point of better readability in the header.