refactor of SalesForce strategy