More clean up, request_headers is now private and requestHeaders