Refactor Salesforce activities