Mainly syntaxic and cosmetic changes in HttpProtocol