refactor along with HSBencher 5e386fd5e4109bab83c50