Refactor hsclient and request
Refactor hsclient and request