Refactor VariableSummary stuff