HTTP: more code cleanup (wip)

Signed-off-by: Eduardo Silva <eduardo@monkey.io>