some refactoring#1629

JPercival wants to merge 5 commits intomastercqframework/clinical_quality_language:masterfrom

lil-bit-cleanupcqframework/clinical_quality_language:lil-bit-cleanupCopy head branch name to clipboard