more Http and Net refactoring