Index: sources/gui/qml/dialogs/NotificationDialog.qml
===================================================================
diff -u -rac9c658e925728918ccf010670d67f00fc0a8c08 -r71918fbc2b8b5c01cb0a348ffd3b83adbca79c9b
--- sources/gui/qml/dialogs/NotificationDialog.qml	(.../NotificationDialog.qml)	(revision ac9c658e925728918ccf010670d67f00fc0a8c08)
+++ sources/gui/qml/dialogs/NotificationDialog.qml	(.../NotificationDialog.qml)	(revision 71918fbc2b8b5c01cb0a348ffd3b83adbca79c9b)
@@ -32,7 +32,6 @@
     property alias titlePixelSize       : _title.font.pixelSize
     property string description         : ""
     property alias  instructionModel    : _listView.model
-//    property var  images                : []
     property alias titleBarForeground   : _title.color
     property alias titleBarBackground   : _titleBar.color
     property alias isSilenced           : _headerButtonGroup.isSilenced
Index: sources/view/hd/alarm/VAlarmInstructionsModel.cpp
===================================================================
diff -u -rad80adbfb49b4a352148f8ce833618a6264f4016 -r71918fbc2b8b5c01cb0a348ffd3b83adbca79c9b
--- sources/view/hd/alarm/VAlarmInstructionsModel.cpp	(.../VAlarmInstructionsModel.cpp)	(revision ad80adbfb49b4a352148f8ce833618a6264f4016)
+++ sources/view/hd/alarm/VAlarmInstructionsModel.cpp	(.../VAlarmInstructionsModel.cpp)	(revision 71918fbc2b8b5c01cb0a348ffd3b83adbca79c9b)
@@ -1,6 +1,5 @@
 #include "VAlarmInstructionsModel.h"
 
-
 VIEW_DEF_CLASS_EX(VAlarmInstructionsModel, QAbstractListModel)
 
 void VAlarmInstructionsModel::initConnections()
Index: sources/view/hd/alarm/VAlarmInstructionsModel.h
===================================================================
diff -u -rac9c658e925728918ccf010670d67f00fc0a8c08 -r71918fbc2b8b5c01cb0a348ffd3b83adbca79c9b
--- sources/view/hd/alarm/VAlarmInstructionsModel.h	(.../VAlarmInstructionsModel.h)	(revision ac9c658e925728918ccf010670d67f00fc0a8c08)
+++ sources/view/hd/alarm/VAlarmInstructionsModel.h	(.../VAlarmInstructionsModel.h)	(revision 71918fbc2b8b5c01cb0a348ffd3b83adbca79c9b)
@@ -1,3 +1,4 @@
+#pragma once
 
 // Qt
 #include <QAbstractListModel>
@@ -9,9 +10,9 @@
 #include "main.h"   // Doxygen : do not remove
 #include "VView.h"
 
+// namespace
 namespace View {
 
-
 class VAlarmInstructionsModel : public QAbstractListModel
 {
     Q_OBJECT
@@ -22,10 +23,9 @@
     };
 
 public:
-
     typedef enum {
         eRole_Instruction = Qt::UserRole,
-        eRole_Image,
+        eRole_Image                     ,
     } DataRole;
 
     QHash<int, QByteArray>  roleNames   (                                                                           ) const override;
@@ -35,7 +35,7 @@
     void                    clear       (                                                                           );
     void                    appendData  (const QHash<int, QVariant> &vData                                          );
 
-    Q_INVOKABLE QVariantMap    get      (int vRow                                                                   ) const;  // Exposed to QML
+    Q_INVOKABLE QVariantMap get         (int vRow                                                                   ) const;  // Exposed to QML
 
     VIEW_DEC_CLASS_EX(VAlarmInstructionsModel, QAbstractListModel)
 
Index: sources/view/hd/alarm/VAlarmStatus.cpp
===================================================================
diff -u -rac9c658e925728918ccf010670d67f00fc0a8c08 -r71918fbc2b8b5c01cb0a348ffd3b83adbca79c9b
--- sources/view/hd/alarm/VAlarmStatus.cpp	(.../VAlarmStatus.cpp)	(revision ac9c658e925728918ccf010670d67f00fc0a8c08)
+++ sources/view/hd/alarm/VAlarmStatus.cpp	(.../VAlarmStatus.cpp)	(revision 71918fbc2b8b5c01cb0a348ffd3b83adbca79c9b)
@@ -161,7 +161,6 @@
             _alarmInstructionsList.appendData( {{VAlarmInstructionsModel::eRole_Instruction,    it.key() },
                                                 {VAlarmInstructionsModel::eRole_Image,          "file:" + it.value()}});
         }
-
         emit didAlarmRaise();
     }
 }
@@ -205,28 +204,24 @@
 
         AlarmData alarmData;
         InstructionData instructionData;
-
         for (const QString &key : _Settings.keys(category, group)) {
             if         (Storage::Settings::isKeyTitle       ( key ) ) {
                 alarmData.title      = _Settings.value(category, group, key).toString();
             } else if  (Storage::Settings::isKeyMessage     ( key ) ) {
                 alarmData.message    = _Settings.value(category, group, key).toString();
             } else {
-
                 const QString imagePath = QStringLiteral("%1%2").arg(_location)
                                                                 .arg(_Settings.value(category, group, key).toString());
-
                 instructionData[key] = QFile::exists(imagePath) ? imagePath : QStringLiteral("%1%2").arg(_location)
                                                                                                     .arg("defaultImage.png");
                 alarmData.instructions  = instructionData;
-
             }
         }
         _alarms[id] = alarmData;
 
         /// DEBUG:
         /// TODO: the MSettings model should do the same has been done here and use map instead of separate structure to iterate vertically, while map supports, keys, values.
-//         qDebug() << "@" << id << _alarms[id].title << _alarms[id].message << _alarms[id].instructions.keys() << _alarms[id].instructions.values();
+        // qDebug() << "@" << id << _alarms[id].title << _alarms[id].message << _alarms[id].instructions.keys() << _alarms[id].instructions.values();
         // for (const auto &key : _alarms[id].instructions.keys()) {
         //     qDebug() << "-" << key << _alarms[id].instructions.value(key);
         // }
Index: sources/view/hd/alarm/VAlarmStatus.h
===================================================================
diff -u -rac9c658e925728918ccf010670d67f00fc0a8c08 -r71918fbc2b8b5c01cb0a348ffd3b83adbca79c9b
--- sources/view/hd/alarm/VAlarmStatus.h	(.../VAlarmStatus.h)	(revision ac9c658e925728918ccf010670d67f00fc0a8c08)
+++ sources/view/hd/alarm/VAlarmStatus.h	(.../VAlarmStatus.h)	(revision 71918fbc2b8b5c01cb0a348ffd3b83adbca79c9b)
@@ -55,7 +55,6 @@
         QString title   = "";
         QString message = "";
         InstructionData instructions;
-//        bool    hasInstruction() { return instructions.count(); }
     };
 
     QMap<quint32, AlarmData> _alarms;