Implement suggested changes from review and fix formatting
Implement suggested changes from review and fix formatting

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