Remove no longer needed params, and extract methods for clarity
Remove no longer needed params, and extract methods for clarity

SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus