refactof hubspotservice