restructionForCompliance: cosmetics
restructureForCompliance: quote target variable throughout