refac: more cleaner code
refac: more cleaner code

bradgearon/ChurchCRM,bradgearon/ChurchCRM,bradgearon/ChurchCRM,ChurchCRM/CRM,ChurchCRM/CRM,ChurchCRM/CRM,bradgearon/ChurchCRM,bradgearon/ChurchCRM,ChurchCRM/CRM,ChurchCRM/CRM