cleaner structure of summary data closes #492