Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Melissa Barber <27c01b4f02a1ef1fa6a8cd210679d47f3b4db0f5@salesforce.com>
SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus