[IMPORT] [code quality] [REF] Improve readability of variable assignment

[eileenmcnaughton]

Overview

Improves variable assignment

Before

Code hard to read. Variables assigned using $$ which makes them hard to track in an IDE

After

Variables are keys in an array. More readable

Technical Details

This is all just preliminary cleanup to fixing a known bug

Comments

[civibot]

(Standard links)

• If this is your first pull-request for CiviCRM, please browse CONTRIBUTING.md for information about the development and testing processes.
• If you are reviewing this pull-request, you may wish to consult the test sites and the Review Standards (long template, short template).