diff --git a/sleepyhead/SleepLib/loader_plugins/edfparser.h b/sleepyhead/SleepLib/loader_plugins/edfparser.h
index 5c7505f7..94fbd5ca 100644
--- a/sleepyhead/SleepLib/loader_plugins/edfparser.h
+++ b/sleepyhead/SleepLib/loader_plugins/edfparser.h
@@ -92,7 +92,7 @@ struct EDFSignal {
 
 
 /*! \class EDFParser
-    \author Mark Watkins <jedimark64_at_users.sourceforge.net>
+    \author Mark Watkins <mark@jedimark.net>
     \brief Parse an EDF+ data file into a list of EDFSignal's
     \note More information on the EDF+ file format can be obtained from http://edfplus.info
     */
@@ -124,8 +124,6 @@ class EDFParser
 
     QList<EDFSignal *> signal;
 
-    //! \brief Look up signal names by SleepLib ChannelID.. A little "ResMed"ified.. :/
-    //EDFSignal *lookupSignal(ChannelID);
     EDFSignal *lookupLabel(QString name, int index=0);
 
     //! \brief Returns the number of signals contained in this EDF file
diff --git a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
index f18821e5..0094f7de 100644
--- a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
@@ -30,8 +30,6 @@ extern QProgressBar *qprogress;
 
 QHash<QString, QList<quint16> > Resmed_Model_Map;
 
-const QString STR_UnknownModel = "Resmed S9 ???";
-
 ChannelID RMS9_EPR, RMS9_EPRLevel, RMS9_Mode, RMS9_SmartStart, RMS9_HumidStatus, RMS9_HumidLevel,
          RMS9_PtAccess, RMS9_Mask, RMS9_ABFilter, RMS9_ClimateControl, RMS9_TubeType,
          RMS9_Temp, RMS9_TempEnable, RMS9_RampEnable;
@@ -39,8 +37,7 @@ ChannelID RMS9_EPR, RMS9_EPRLevel, RMS9_Mode, RMS9_SmartStart, RMS9_HumidStatus,
 const QString STR_ResMed_AirSense10 = "AirSense 10";
 const QString STR_ResMed_AirCurve10= "AirCurve 10";
 const QString STR_ResMed_S9 = "S9";
-
-
+const QString STR_UnknownModel = "Resmed S9 ???";
 
 // Return the model name matching the supplied model number.
 const QString & lookupModel(quint16 model)
@@ -1096,7 +1093,7 @@ EDFType lookupEDFType(QString text)
 // Pretend to parse the EVE file to get the duration out of it.
 int PeekAnnotations(const QString & path, quint32 &start, quint32 &end)
 {
-    EDFParser edf(path);
+    ResMedEDFParser edf(path);
     if (!edf.Parse())
         return -1;
 
@@ -1897,7 +1894,7 @@ int ResmedLoader::Open(QString path)
     strsess.clear();
     ParseSTR(m, strfiles);
 
-    EDFParser stredf(strpath);
+    ResMedEDFParser stredf(strpath);
     if (!stredf.Parse()) {
         qDebug() << "Faulty file" << RMS9_STR_strfile;
         return 0;
@@ -2219,7 +2216,7 @@ QString ResmedLoader::backup(QString fullname, QString backup_path)
 
 bool ResmedLoader::LoadCSL(Session *sess, const QString & path)
 {
-    EDFParser edf(path);
+    ResMedEDFParser edf(path);
     if (!edf.Parse())
         return false;
 
@@ -2363,7 +2360,7 @@ bool ResmedLoader::LoadCSL(Session *sess, const QString & path)
 
 bool ResmedLoader::LoadEVE(Session *sess, const QString & path)
 {
-    EDFParser edf(path);
+    ResMedEDFParser edf(path);
     if (!edf.Parse())
         return false;
 
@@ -2516,7 +2513,7 @@ bool ResmedLoader::LoadEVE(Session *sess, const QString & path)
 
 bool ResmedLoader::LoadBRP(Session *sess, const QString & path)
 {
-    EDFParser edf(path);
+    ResMedEDFParser edf(path);
     if (!edf.Parse())
         return false;
 
diff --git a/sleepyhead/SleepLib/loader_plugins/resmed_loader.h b/sleepyhead/SleepLib/loader_plugins/resmed_loader.h
index 19499925..5b8a4b10 100644
--- a/sleepyhead/SleepLib/loader_plugins/resmed_loader.h
+++ b/sleepyhead/SleepLib/loader_plugins/resmed_loader.h
@@ -8,8 +8,7 @@
 
 #ifndef RESMED_LOADER_H
 #define RESMED_LOADER_H
-//#include <map>
-//using namespace std;
+
 #include <QVector>
 #include "SleepLib/machine.h" // Base class: MachineLoader
 #include "SleepLib/machine_loader.h"