Cleanup and Additions - Variables and Helper Classes #863

Cleanup and Additions - Variables and Helper Classes
Fixes #863