diff --git a/sleepyhead/SleepLib/day.cpp b/sleepyhead/SleepLib/day.cpp
index cb007d6d..1b937da3 100644
--- a/sleepyhead/SleepLib/day.cpp
+++ b/sleepyhead/SleepLib/day.cpp
@@ -29,7 +29,7 @@ Day::~Day()
     }
 
 }
-MachineType Day::machine_type()
+MachineType Day::machine_type() const
 {
     return machine->GetType();
 }
diff --git a/sleepyhead/SleepLib/day.h b/sleepyhead/SleepLib/day.h
index 52098d3e..1d9df734 100644
--- a/sleepyhead/SleepLib/day.h
+++ b/sleepyhead/SleepLib/day.h
@@ -41,7 +41,7 @@ class Day
     void AddSession(Session *s);
 
     //! \brief Returns this machines type
-    MachineType machine_type();
+    MachineType machine_type() const;
 
     //! \brief Returns the count of all this days sessions' events for this day
     int count(ChannelID code);
diff --git a/sleepyhead/SleepLib/machine.h b/sleepyhead/SleepLib/machine.h
index 0f3ef13c..cd5ca918 100644
--- a/sleepyhead/SleepLib/machine.h
+++ b/sleepyhead/SleepLib/machine.h
@@ -114,7 +114,7 @@ class Machine
     const QString &GetClass() { return m_class; }
 
     //! \brief Returns the type of machine, according to MachineType enum
-    const MachineType &GetType() { return m_type; }
+    const MachineType &GetType() const { return m_type; }
 
     //! \brief Returns the machineID as a lower case hexadecimal string
     QString hexid() { return QString().sprintf("%08lx", m_id); }
diff --git a/sleepyhead/SleepLib/profiles.cpp b/sleepyhead/SleepLib/profiles.cpp
index 5453f531..88164bb8 100644
--- a/sleepyhead/SleepLib/profiles.cpp
+++ b/sleepyhead/SleepLib/profiles.cpp
@@ -325,69 +325,46 @@ void Profile::AddDay(QDate date, Day *day, MachineType mt)
     daylist[date].push_back(day);
 }
 
-// Get Day record if data available for date and machine type, and has enabled session data, else return NULL
+// Get Day record if data available for date and machine type,
+// and has enabled session data, else return NULL
 Day *Profile::GetGoodDay(QDate date, MachineType type)
 {
-    Day *day = NULL;
+    Day *day = GetDay(date, type);
+    if (!day)
+        return NULL;
 
-    QMap<QDate, QList<Day *> >::iterator dli = daylist.find(date);
+    // Just return the day if not matching for a machine.
+    if (type == MT_UNKNOWN)
+        return day;
 
-    if (dli != daylist.end()) {
-
-        for (QList<Day *>::iterator di = (*dli).begin(); di != (*dli).end(); di++) {
-
-            if (type == MT_UNKNOWN) { // Who cares.. We just want to know there is data available.
-                day = (*di);
-                break;
-            }
-
-            if ((*di)->machine_type() == type) {
-                bool b = false;
-
-                for (int i = 0; i < (*di)->size(); i++) {
-                    if ((*(*di))[i]->enabled()) {
-                        b = true;
-                        break;
-                    }
-                }
-
-                if (b) {
-                    day = (*di);
-                    break;
-                }
-            }
-        }
+    // For a machine match, find at least one enabled Session.
+    Q_ASSERT(day->machine_type() == type);
+    for (int i = 0; i < day->size(); ++i) {
+        if ((*day)[i]->enabled())
+            return day;
     }
 
-    return day;
+    // No enabled Sessions were found.
+    return NULL;
 }
 
 Day *Profile::GetDay(QDate date, MachineType type)
 {
-    Day *tmp, *day = NULL;
+    if (!daylist.contains(date))
+        return NULL;
 
-    if (daylist.find(date) != daylist.end()) {
-        for (QList<Day *>::iterator di = daylist[date].begin(); di != daylist[date].end(); di++) {
-            tmp = *di;
+    QList<Day *> list(daylist.value(date));
+    for (int i = 0; i < list.size(); ++i) {
+        Day *day = list.at(i);
+        Q_ASSERT(day != NULL);
 
-            if (!tmp) {
-                qDebug() << "This should never happen in Profile::GetDay()";
-                break;
-            }
-
-            if (type == MT_UNKNOWN) { // Who cares.. We just want to know there is data available.
-                day = tmp;
-                break;
-            }
-
-            if (tmp->machine_type() == type) {
-                day = tmp;
-                break;
-            }
+        // Just return the day if not matching for a machine.
+        if (day->machine_type() == type || type == MT_UNKNOWN) {
+            return day;
         }
     }
 
-    return day;
+    return NULL;
 }