Index: sources/device/DeviceController.h
===================================================================
diff -u -re2dc7bd9995a3bb410aa472a1f95c1cc9ba3136d -re8262d170bb94046ddb767074a31530bdf4a2319
--- sources/device/DeviceController.h	(.../DeviceController.h)	(revision e2dc7bd9995a3bb410aa472a1f95c1cc9ba3136d)
+++ sources/device/DeviceController.h	(.../DeviceController.h)	(revision e8262d170bb94046ddb767074a31530bdf4a2319)
@@ -33,12 +33,18 @@
 
 namespace Device {
 
+/*!
+ * \brief   The TimedProcess class
+ * \details This is a timed process class which has a timeout
+ *          and will kill the process if it can't be finished within the given timeout
+ *          in milliseconds.
+ */
 class TimedProcess : public QObject {
     Q_OBJECT
 
     explicit TimedProcess(QObject *parent = nullptr) : QObject(parent) { }
     int          _id        = 0;
-    int          _interval  = 0;
+    int          _timeout  = 0;
     QProcess    *_process   = nullptr;
     QString      _command   = "";
 
@@ -50,13 +56,13 @@
         deleteLater();
     }
 public:
-    TimedProcess(QProcess *vProcess, const QString &vCommand, int vInterval)
-        : QObject(), _interval(vInterval), _process(vProcess), _command(vCommand) {
+    TimedProcess(QProcess *vProcess, const QString &vCommand, int vTimeout)
+        : QObject(), _timeout(vTimeout), _process(vProcess), _command(vCommand) {
         connect(_process, SIGNAL(  finished(int)),
                 this    ,   SLOT(onFinish  (int)));
     }
     void start() {
-        _id = startTimer(_interval);
+        _id = startTimer(_timeout);
         _process->start(_command);
     }
 
Index: sources/device/DeviceError.h
===================================================================
diff -u -r9ae3b0d6624904693329309aaf8ff02784c17184 -re8262d170bb94046ddb767074a31530bdf4a2319
--- sources/device/DeviceError.h	(.../DeviceError.h)	(revision 9ae3b0d6624904693329309aaf8ff02784c17184)
+++ sources/device/DeviceError.h	(.../DeviceError.h)	(revision e8262d170bb94046ddb767074a31530bdf4a2319)
@@ -59,6 +59,5 @@
 
     static QString            deviceErrorText( DeviceError::Scripts_Error_Enum vError );
     static Scripts_Error_Enum checkScript(QString &vScript, const QString &vShellScript);
-
 };
 }
Index: sources/device/DeviceModels.h
===================================================================
diff -u -rb7c9de054c6b7a1ca4bac9fbb0ec5d4ac06620a9 -re8262d170bb94046ddb767074a31530bdf4a2319
--- sources/device/DeviceModels.h	(.../DeviceModels.h)	(revision b7c9de054c6b7a1ca4bac9fbb0ec5d4ac06620a9)
+++ sources/device/DeviceModels.h	(.../DeviceModels.h)	(revision e8262d170bb94046ddb767074a31530bdf4a2319)
@@ -78,11 +78,15 @@
 };
 
 
+/*!
+ * \brief   The MDeviceBrightnessRequest class
+ * \details The model for the device brightness value modification request.
+ */
+class MDeviceBrightnessRequest : public MDeviceRequestBase {
 // ------------------------------------------------------------------
-// TODO : I believe the two model can be merged. They have so much in common.
+// TODO : Merge the two models as they have much in common in this case.
 //        On the CANBus it was separated since the type of data in send and receive was totally different.
 //        But here it's the same.
-class MDeviceBrightnessRequest : public MDeviceRequestBase {
 public:
     // TODO : these needs to be available in Views
     static const quint8 mBrightness_min    =  2;
@@ -106,6 +110,10 @@
     }
 };
 
+/*!
+ * \brief   The MDeviceBrightnessResponse class
+ * \details The model for the device brightness value request.
+ */
 class MDeviceBrightnessResponse : public MDeviceResponseBase {
 public:
     struct Data : MDeviceResponseBase::Data {
@@ -117,7 +125,10 @@
     Data        data        () const;
 };
 
-
+/*!
+ * \brief   The MDeviceBluetoothPairedResetRequest class
+ * \details The model for the bluetooth pared removal script call.
+ */
 class MDeviceBluetoothPairedResetRequest : public MDeviceRequestBase {
 public:
     struct Data {
@@ -128,6 +139,10 @@
     }
 };
 
+/*!
+ * \brief   The MDeviceBluetoothPairedResetResponse class
+ * \details The model for the bluetooth pared removal script call returned value / response.
+ */
 class MDeviceBluetoothPairedResetResponse : public MDeviceResponseBase {
 public:
     struct Data : MDeviceResponseBase::Data {
Index: sources/view/hd/alarm/VAlarmStatus.cpp
===================================================================
diff -u -raa873f8620e3f402bf60827e9c54623b5e09280e -re8262d170bb94046ddb767074a31530bdf4a2319
--- sources/view/hd/alarm/VAlarmStatus.cpp	(.../VAlarmStatus.cpp)	(revision aa873f8620e3f402bf60827e9c54623b5e09280e)
+++ sources/view/hd/alarm/VAlarmStatus.cpp	(.../VAlarmStatus.cpp)	(revision e8262d170bb94046ddb767074a31530bdf4a2319)
@@ -144,7 +144,7 @@
         alarm_Flag_noMinimize       (false);
     }
     else {
-        alarm_Flag_noMinimize       (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_MINIMIZE        ));
+        alarm_Flag_noMinimize       (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_MINIMIZE    ));
     }
     alarm_Flag_alarmsCondition  (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION      ));
 
Index: sources/view/settings/VBluetooth.cpp
===================================================================
diff -u -r2b90169339a65399c03c31d1a40adffee87e7719 -re8262d170bb94046ddb767074a31530bdf4a2319
--- sources/view/settings/VBluetooth.cpp	(.../VBluetooth.cpp)	(revision 2b90169339a65399c03c31d1a40adffee87e7719)
+++ sources/view/settings/VBluetooth.cpp	(.../VBluetooth.cpp)	(revision e8262d170bb94046ddb767074a31530bdf4a2319)
@@ -257,11 +257,11 @@
     case MBluetooth::eIS_Device_Init            : message = tr("Device Initializing ..."                ); break;
     case MBluetooth::eIS_Device_Error_Init      : message = tr("Device Initialization Error"            ); break;
     case MBluetooth::eIS_Device_Start           : message = tr("Device Connecting ..."                  ); break;
-    case MBluetooth::eIS_Device_Waiting         : message = tr("Device Ready For Measurement ..."       ); break; // received feed back and changed the "Waiting" to this to avoid user confusion.
+    case MBluetooth::eIS_Device_Waiting         : message = tr("Device Ready For Measurement ..."       ); break; // received feedback and changed the "Waiting" to this to avoid user confusion.
     case MBluetooth::eIS_Device_Error           : message = tr("Device Connection Error"                ); break;
     case MBluetooth::eIS_Device_Connect         : message = tr("Device Connected"                       ); break;
     case MBluetooth::eIS_Device_Done            : message = tr("Device Clean Up"                        ); break;
-    case MBluetooth::eIS_Device_Disconnect      : message = tr("Device In Power Saving Mode"            ); break; // received feed back and changed the "Disconnected" to this to avoid user confusion.
+    case MBluetooth::eIS_Device_Disconnect      : message = tr("Device In Power Saving Mode"            ); break; // received feedback and changed the "Disconnected" to this to avoid user confusion.
 
     case MBluetooth::eIS_Service_Start          : message = tr("Service Scanning ..."                   ); break;
     case MBluetooth::eIS_Service_Error          : message = tr("Service Error: %1"                      ).arg(_error        ); break;