Http client
Cleanup
Make almost everything internal