diff --git a/oscar/exportcsv.cpp b/oscar/exportcsv.cpp
index 635922cc..5842cfd3 100644
--- a/oscar/exportcsv.cpp
+++ b/oscar/exportcsv.cpp
@@ -1,5 +1,6 @@
-/* ExportCSV module implementation
+/* ExportCSV module implementation
  *
+ * Copyright (c) 2020 The OSCAR Team
  * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
  *
  * This file is subject to the terms and conditions of the GNU General Public
@@ -180,24 +181,16 @@ void ExportCSV::on_exportButton_clicked()
     countlist.append(CPAP_UserFlag2);
     countlist.append(CPAP_PressurePulse);
 
-    avglist.append(CPAP_Pressure);
-    avglist.append(CPAP_IPAP);
-    avglist.append(CPAP_EPAP);
-    avglist.append(CPAP_FLG);        // Pholynyk, 25Aug2015, add ResMed Flow Limitation
+    QVector<ChannelID> statChannels = { CPAP_Pressure, CPAP_IPAP, CPAP_EPAP, CPAP_FLG };
+    for (auto & chan : statChannels) {
+        avglist.append(chan);
+        p90list.append(chan);
+        maxlist.append(chan);
+    }
 
-    p90list.append(CPAP_Pressure);
-    p90list.append(CPAP_IPAP);
-    p90list.append(CPAP_EPAP);
-    p90list.append(CPAP_FLG);
-       
     float percentile=p_profile->general->prefCalcPercentile()/100.0;                   // Pholynyk, 18Aug2015
     EventDataType percent = percentile;                                                // was 0.90F
 
-    maxlist.append(CPAP_Pressure);    // Pholynyk, 18Aug2015, add maximums
-    maxlist.append(CPAP_IPAP);
-    maxlist.append(CPAP_EPAP);
-    maxlist.append(CPAP_FLG);
-
     // Not sure this section should be translateable.. :-/
     if (ui->rb1_details->isChecked()) {
         header = tr("DateTime") + sep + tr("Session") + sep + tr("Event") + sep + tr("Data/Duration");