Http request manager cleanup and refactoring