diff --git a/packages/sensors_plus/sensors_plus_aurora/aurora/include/sensors_plus_aurora/sensors_plus_aurora_plugin.h b/packages/sensors_plus/sensors_plus_aurora/aurora/include/sensors_plus_aurora/sensors_plus_aurora_plugin.h
index e7cc98c..0ddd949 100644
--- a/packages/sensors_plus/sensors_plus_aurora/aurora/include/sensors_plus_aurora/sensors_plus_aurora_plugin.h
+++ b/packages/sensors_plus/sensors_plus_aurora/aurora/include/sensors_plus_aurora/sensors_plus_aurora_plugin.h
@@ -11,19 +11,17 @@
 
 #include <QtCore>
 
-#include <sensormanagerinterface.h>
-#include <orientationsensor_i.h>
 #include <accelerometersensor_i.h>
-#include <compasssensor_i.h>
-#include <tapsensor_i.h>
 #include <alssensor_i.h>
+#include <compasssensor_i.h>
+#include <magnetometersensor_i.h>
+#include <orientationsensor_i.h>
 #include <proximitysensor_i.h>
 #include <rotationsensor_i.h>
-#include <magnetometersensor_i.h>
+#include <sensormanagerinterface.h>
+#include <tapsensor_i.h>
 
-class PLUGIN_EXPORT SensorsPlusAuroraPlugin final
-    : public QObject,
-      public PluginInterface
+class PLUGIN_EXPORT SensorsPlusAuroraPlugin final : public QObject, public PluginInterface
 {
     Q_OBJECT
 
@@ -41,7 +39,7 @@ public slots:
     void EventSensorMagnetometer(const MagneticField &data);
 
 private:
-    template <typename T>
+    template<typename T>
     bool RegisterSensorInterface(QString sensor);
     void EventChannelNull(std::string channel);
     void EventChannelData(std::string channel, std::vector<Encodable> result);
diff --git a/packages/sensors_plus/sensors_plus_aurora/aurora/sensors_plus_aurora_plugin.cpp b/packages/sensors_plus/sensors_plus_aurora/aurora/sensors_plus_aurora_plugin.cpp
index 225ab74..395fa72 100644
--- a/packages/sensors_plus/sensors_plus_aurora/aurora/sensors_plus_aurora_plugin.cpp
+++ b/packages/sensors_plus/sensors_plus_aurora/aurora/sensors_plus_aurora_plugin.cpp
@@ -3,115 +3,151 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <sensors_plus_aurora/sensors_plus_aurora_plugin.h>
 #include <flutter/method-channel.h>
+#include <sensors_plus_aurora/sensors_plus_aurora_plugin.h>
 #include <QDebug>
 
-#include <sensormanagerinterface.h>
-#include <orientationsensor_i.h>
 #include <accelerometersensor_i.h>
-#include <compasssensor_i.h>
-#include <tapsensor_i.h>
 #include <alssensor_i.h>
+#include <compasssensor_i.h>
+#include <magnetometersensor_i.h>
+#include <orientationsensor_i.h>
 #include <proximitysensor_i.h>
 #include <rotationsensor_i.h>
-#include <magnetometersensor_i.h>
-
-namespace KeyChannel
-{
-    constexpr auto Orientation = "sensors_plus_aurora_orientationsensor";
-    constexpr auto Accelerometer = "sensors_plus_aurora_accelerometersensor";
-    constexpr auto Compass = "sensors_plus_aurora_compasssensor";
-    constexpr auto Tap = "sensors_plus_aurora_tapsensor";
-    constexpr auto ALS = "sensors_plus_aurora_alssensor";
-    constexpr auto Proximity = "sensors_plus_aurora_proximitysensor";
-    constexpr auto Rotation = "sensors_plus_aurora_rotationsensor";
-    constexpr auto Magnetometer = "sensors_plus_aurora_magnetometersensor";
-}
+#include <sensormanagerinterface.h>
+#include <tapsensor_i.h>
 
-namespace KeySensor
-{
-    constexpr auto Orientation = "orientationsensor";
-    constexpr auto Accelerometer = "accelerometersensor";
-    constexpr auto Compass = "compasssensor";
-    constexpr auto Tap = "tapsensor";
-    constexpr auto ALS = "alssensor";
-    constexpr auto Proximity = "proximitysensor";
-    constexpr auto Rotation = "rotationsensor";
-    constexpr auto Magnetometer = "magnetometersensor";
-} /* namespace */
+namespace KeyChannel {
+constexpr auto Orientation = "sensors_plus_aurora_orientationsensor";
+constexpr auto Accelerometer = "sensors_plus_aurora_accelerometersensor";
+constexpr auto Compass = "sensors_plus_aurora_compasssensor";
+constexpr auto Tap = "sensors_plus_aurora_tapsensor";
+constexpr auto ALS = "sensors_plus_aurora_alssensor";
+constexpr auto Proximity = "sensors_plus_aurora_proximitysensor";
+constexpr auto Rotation = "sensors_plus_aurora_rotationsensor";
+constexpr auto Magnetometer = "sensors_plus_aurora_magnetometersensor";
+} // namespace KeyChannel
+
+namespace KeySensor {
+constexpr auto Orientation = "orientationsensor";
+constexpr auto Accelerometer = "accelerometersensor";
+constexpr auto Compass = "compasssensor";
+constexpr auto Tap = "tapsensor";
+constexpr auto ALS = "alssensor";
+constexpr auto Proximity = "proximitysensor";
+constexpr auto Rotation = "rotationsensor";
+constexpr auto Magnetometer = "magnetometersensor";
+} // namespace KeySensor
 
 void SensorsPlusAuroraPlugin::RegisterWithRegistrar(PluginRegistrar &registrar)
 {
     registrar.RegisterEventChannel(
-        KeyChannel::Orientation, MethodCodecType::Standard,
-        [this](const Encodable &)
-        { EnableSensorOrientation(); return EventResponse(); },
-        [this](const Encodable &)
-        { DisableSensorOrientation(); return EventResponse(); });
+        KeyChannel::Orientation,
+        MethodCodecType::Standard,
+        [this](const Encodable &) {
+            EnableSensorOrientation();
+            return EventResponse();
+        },
+        [this](const Encodable &) {
+            DisableSensorOrientation();
+            return EventResponse();
+        });
 
     registrar.RegisterEventChannel(
-        KeyChannel::Accelerometer, MethodCodecType::Standard,
-        [this](const Encodable &)
-        { EnableSensorAccelerometer(); return EventResponse(); },
-        [this](const Encodable &)
-        { DisableSensorAccelerometer(); return EventResponse(); });
+        KeyChannel::Accelerometer,
+        MethodCodecType::Standard,
+        [this](const Encodable &) {
+            EnableSensorAccelerometer();
+            return EventResponse();
+        },
+        [this](const Encodable &) {
+            DisableSensorAccelerometer();
+            return EventResponse();
+        });
 
     registrar.RegisterEventChannel(
-        KeyChannel::Compass, MethodCodecType::Standard,
-        [this](const Encodable &)
-        { EnableSensorCompass(); return EventResponse(); },
-        [this](const Encodable &)
-        { DisableSensorCompass(); return EventResponse(); });
+        KeyChannel::Compass,
+        MethodCodecType::Standard,
+        [this](const Encodable &) {
+            EnableSensorCompass();
+            return EventResponse();
+        },
+        [this](const Encodable &) {
+            DisableSensorCompass();
+            return EventResponse();
+        });
 
     registrar.RegisterEventChannel(
-        KeyChannel::Tap, MethodCodecType::Standard,
-        [this](const Encodable &)
-        { EnableSensorTap(); return EventResponse(); },
-        [this](const Encodable &)
-        { DisableSensorTap(); return EventResponse(); });
+        KeyChannel::Tap,
+        MethodCodecType::Standard,
+        [this](const Encodable &) {
+            EnableSensorTap();
+            return EventResponse();
+        },
+        [this](const Encodable &) {
+            DisableSensorTap();
+            return EventResponse();
+        });
 
     registrar.RegisterEventChannel(
-        KeyChannel::ALS, MethodCodecType::Standard,
-        [this](const Encodable &)
-        { EnableSensorALS(); return EventResponse(); },
-        [this](const Encodable &)
-        { DisableSensorALS(); return EventResponse(); });
+        KeyChannel::ALS,
+        MethodCodecType::Standard,
+        [this](const Encodable &) {
+            EnableSensorALS();
+            return EventResponse();
+        },
+        [this](const Encodable &) {
+            DisableSensorALS();
+            return EventResponse();
+        });
 
     registrar.RegisterEventChannel(
-        KeyChannel::Proximity, MethodCodecType::Standard,
-        [this](const Encodable &)
-        { EnableSensorProximity(); return EventResponse(); },
-        [this](const Encodable &)
-        { DisableSensorProximity(); return EventResponse(); });
+        KeyChannel::Proximity,
+        MethodCodecType::Standard,
+        [this](const Encodable &) {
+            EnableSensorProximity();
+            return EventResponse();
+        },
+        [this](const Encodable &) {
+            DisableSensorProximity();
+            return EventResponse();
+        });
 
     registrar.RegisterEventChannel(
-        KeyChannel::Rotation, MethodCodecType::Standard,
-        [this](const Encodable &)
-        { EnableSensorRotation(); return EventResponse(); },
-        [this](const Encodable &)
-        { DisableSensorRotation(); return EventResponse(); });
+        KeyChannel::Rotation,
+        MethodCodecType::Standard,
+        [this](const Encodable &) {
+            EnableSensorRotation();
+            return EventResponse();
+        },
+        [this](const Encodable &) {
+            DisableSensorRotation();
+            return EventResponse();
+        });
 
     registrar.RegisterEventChannel(
-        KeyChannel::Magnetometer, MethodCodecType::Standard,
-        [this](const Encodable &)
-        { EnableSensorMagnetometer(); return EventResponse(); },
-        [this](const Encodable &)
-        { DisableSensorMagnetometer(); return EventResponse(); });
+        KeyChannel::Magnetometer,
+        MethodCodecType::Standard,
+        [this](const Encodable &) {
+            EnableSensorMagnetometer();
+            return EventResponse();
+        },
+        [this](const Encodable &) {
+            DisableSensorMagnetometer();
+            return EventResponse();
+        });
 }
 
-template <typename T>
+template<typename T>
 bool SensorsPlusAuroraPlugin::RegisterSensorInterface(QString sensor)
 {
     SensorManagerInterface &sm = SensorManagerInterface::instance();
-    if (!sm.isValid())
-    {
+    if (!sm.isValid()) {
         return false;
     }
 
     QDBusReply<bool> reply(sm.loadPlugin(sensor));
-    if (!reply.isValid() || !reply.value())
-    {
+    if (!reply.isValid() || !reply.value()) {
         return false;
     }
 
@@ -135,18 +171,15 @@ void SensorsPlusAuroraPlugin::EventChannelData(std::string channel, std::vector<
  */
 void SensorsPlusAuroraPlugin::EnableSensorOrientation()
 {
-    if (m_ifaceOrientation == nullptr)
-    {
-        if (!RegisterSensorInterface<OrientationSensorChannelInterface>(KeySensor::Orientation))
-        {
+    if (m_ifaceOrientation == nullptr) {
+        if (!RegisterSensorInterface<OrientationSensorChannelInterface>(KeySensor::Orientation)) {
             EventChannelNull(KeyChannel::Orientation);
             return;
         }
 
         m_ifaceOrientation = OrientationSensorChannelInterface::interface(KeySensor::Orientation);
 
-        if (!m_ifaceOrientation)
-        {
+        if (!m_ifaceOrientation) {
             EventChannelNull(KeyChannel::Orientation);
             return;
         }
@@ -163,12 +196,9 @@ void SensorsPlusAuroraPlugin::EnableSensorOrientation()
 
 void SensorsPlusAuroraPlugin::DisableSensorOrientation()
 {
-    if (m_ifaceOrientation == nullptr)
-    {
-        return;
+    if (m_ifaceOrientation) {
+        m_ifaceOrientation->stop();
     }
-
-    m_ifaceOrientation->stop();
 }
 
 void SensorsPlusAuroraPlugin::EventSensorOrientation(const Unsigned &data)
@@ -183,18 +213,17 @@ void SensorsPlusAuroraPlugin::EventSensorOrientation(const Unsigned &data)
  */
 void SensorsPlusAuroraPlugin::EnableSensorAccelerometer()
 {
-    if (m_ifaceAccelerometer == nullptr)
-    {
-        if (!RegisterSensorInterface<AccelerometerSensorChannelInterface>(KeySensor::Accelerometer))
-        {
+    if (m_ifaceAccelerometer == nullptr) {
+        if (!RegisterSensorInterface<AccelerometerSensorChannelInterface>(
+                KeySensor::Accelerometer)) {
             EventChannelNull(KeyChannel::Accelerometer);
             return;
         }
 
-        m_ifaceAccelerometer = AccelerometerSensorChannelInterface::interface(KeySensor::Accelerometer);
+        m_ifaceAccelerometer = AccelerometerSensorChannelInterface::interface(
+            KeySensor::Accelerometer);
 
-        if (!m_ifaceAccelerometer)
-        {
+        if (!m_ifaceAccelerometer) {
             EventChannelNull(KeyChannel::Accelerometer);
             return;
         }
@@ -211,12 +240,9 @@ void SensorsPlusAuroraPlugin::EnableSensorAccelerometer()
 
 void SensorsPlusAuroraPlugin::DisableSensorAccelerometer()
 {
-    if (m_ifaceAccelerometer == nullptr)
-    {
-        return;
+    if (m_ifaceAccelerometer) {
+        m_ifaceAccelerometer->stop();
     }
-
-    m_ifaceAccelerometer->stop();
 }
 
 void SensorsPlusAuroraPlugin::EventSensorAccelerometer(const XYZ &data)
@@ -233,18 +259,15 @@ void SensorsPlusAuroraPlugin::EventSensorAccelerometer(const XYZ &data)
  */
 void SensorsPlusAuroraPlugin::EnableSensorCompass()
 {
-    if (m_ifaceCompass == nullptr)
-    {
-        if (!RegisterSensorInterface<CompassSensorChannelInterface>(KeySensor::Compass))
-        {
+    if (m_ifaceCompass == nullptr) {
+        if (!RegisterSensorInterface<CompassSensorChannelInterface>(KeySensor::Compass)) {
             EventChannelNull(KeyChannel::Compass);
             return;
         }
 
         m_ifaceCompass = CompassSensorChannelInterface::interface(KeySensor::Compass);
 
-        if (!m_ifaceCompass)
-        {
+        if (!m_ifaceCompass) {
             EventChannelNull(KeyChannel::Compass);
             return;
         }
@@ -261,12 +284,9 @@ void SensorsPlusAuroraPlugin::EnableSensorCompass()
 
 void SensorsPlusAuroraPlugin::DisableSensorCompass()
 {
-    if (m_ifaceCompass == nullptr)
-    {
-        return;
+    if (m_ifaceCompass) {
+        m_ifaceCompass->stop();
     }
-
-    m_ifaceCompass->stop();
 }
 
 void SensorsPlusAuroraPlugin::EventSensorCompass(const Compass &data)
@@ -282,18 +302,15 @@ void SensorsPlusAuroraPlugin::EventSensorCompass(const Compass &data)
  */
 void SensorsPlusAuroraPlugin::EnableSensorTap()
 {
-    if (m_ifaceTap == nullptr)
-    {
-        if (!RegisterSensorInterface<TapSensorChannelInterface>(KeySensor::Tap))
-        {
+    if (m_ifaceTap == nullptr) {
+        if (!RegisterSensorInterface<TapSensorChannelInterface>(KeySensor::Tap)) {
             EventChannelNull(KeyChannel::Tap);
             return;
         }
 
         m_ifaceTap = TapSensorChannelInterface::interface(KeySensor::Tap);
 
-        if (!m_ifaceTap)
-        {
+        if (!m_ifaceTap) {
             EventChannelNull(KeyChannel::Tap);
             return;
         }
@@ -309,12 +326,9 @@ void SensorsPlusAuroraPlugin::EnableSensorTap()
 
 void SensorsPlusAuroraPlugin::DisableSensorTap()
 {
-    if (m_ifaceTap == nullptr)
-    {
-        return;
+    if (m_ifaceTap) {
+        m_ifaceTap->stop();
     }
-
-    m_ifaceTap->stop();
 }
 
 void SensorsPlusAuroraPlugin::EventSensorTap(const Tap &data)
@@ -330,18 +344,15 @@ void SensorsPlusAuroraPlugin::EventSensorTap(const Tap &data)
  */
 void SensorsPlusAuroraPlugin::EnableSensorALS()
 {
-    if (m_ifaceALS == nullptr)
-    {
-        if (!RegisterSensorInterface<ALSSensorChannelInterface>(KeySensor::ALS))
-        {
+    if (m_ifaceALS == nullptr) {
+        if (!RegisterSensorInterface<ALSSensorChannelInterface>(KeySensor::ALS)) {
             EventChannelNull(KeyChannel::ALS);
             return;
         }
 
         m_ifaceALS = ALSSensorChannelInterface::interface(KeySensor::ALS);
 
-        if (!m_ifaceALS)
-        {
+        if (!m_ifaceALS) {
             EventChannelNull(KeyChannel::ALS);
             return;
         }
@@ -358,12 +369,9 @@ void SensorsPlusAuroraPlugin::EnableSensorALS()
 
 void SensorsPlusAuroraPlugin::DisableSensorALS()
 {
-    if (m_ifaceALS == nullptr)
-    {
-        return;
+    if (m_ifaceALS) {
+        m_ifaceALS->stop();
     }
-
-    m_ifaceALS->stop();
 }
 
 void SensorsPlusAuroraPlugin::EventSensorALS(const Unsigned &data)
@@ -378,18 +386,15 @@ void SensorsPlusAuroraPlugin::EventSensorALS(const Unsigned &data)
  */
 void SensorsPlusAuroraPlugin::EnableSensorProximity()
 {
-    if (m_ifaceProximity == nullptr)
-    {
-        if (!RegisterSensorInterface<ProximitySensorChannelInterface>(KeySensor::Proximity))
-        {
+    if (m_ifaceProximity == nullptr) {
+        if (!RegisterSensorInterface<ProximitySensorChannelInterface>(KeySensor::Proximity)) {
             EventChannelNull(KeyChannel::Proximity);
             return;
         }
 
         m_ifaceProximity = ProximitySensorChannelInterface::interface(KeySensor::Proximity);
 
-        if (!m_ifaceProximity)
-        {
+        if (!m_ifaceProximity) {
             EventChannelNull(KeyChannel::Proximity);
             return;
         }
@@ -406,12 +411,9 @@ void SensorsPlusAuroraPlugin::EnableSensorProximity()
 
 void SensorsPlusAuroraPlugin::DisableSensorProximity()
 {
-    if (m_ifaceProximity == nullptr)
-    {
-        return;
+    if (m_ifaceProximity) {
+        m_ifaceProximity->stop();
     }
-
-    m_ifaceProximity->stop();
 }
 
 void SensorsPlusAuroraPlugin::EventSensorProximity(const Proximity &data)
@@ -426,18 +428,15 @@ void SensorsPlusAuroraPlugin::EventSensorProximity(const Proximity &data)
  */
 void SensorsPlusAuroraPlugin::EnableSensorRotation()
 {
-    if (m_ifaceRotation == nullptr)
-    {
-        if (!RegisterSensorInterface<RotationSensorChannelInterface>(KeySensor::Rotation))
-        {
+    if (m_ifaceRotation == nullptr) {
+        if (!RegisterSensorInterface<RotationSensorChannelInterface>(KeySensor::Rotation)) {
             EventChannelNull(KeyChannel::Rotation);
             return;
         }
 
         m_ifaceRotation = RotationSensorChannelInterface::interface(KeySensor::Rotation);
 
-        if (!m_ifaceRotation)
-        {
+        if (!m_ifaceRotation) {
             EventChannelNull(KeyChannel::Rotation);
             return;
         }
@@ -454,12 +453,9 @@ void SensorsPlusAuroraPlugin::EnableSensorRotation()
 
 void SensorsPlusAuroraPlugin::DisableSensorRotation()
 {
-    if (m_ifaceRotation == nullptr)
-    {
-        return;
+    if (m_ifaceRotation) {
+        m_ifaceRotation->stop();
     }
-
-    m_ifaceRotation->stop();
 }
 
 void SensorsPlusAuroraPlugin::EventSensorRotation(const XYZ &data)
@@ -476,18 +472,15 @@ void SensorsPlusAuroraPlugin::EventSensorRotation(const XYZ &data)
  */
 void SensorsPlusAuroraPlugin::EnableSensorMagnetometer()
 {
-    if (m_ifaceMagnetometer == nullptr)
-    {
-        if (!RegisterSensorInterface<MagnetometerSensorChannelInterface>(KeySensor::Magnetometer))
-        {
+    if (m_ifaceMagnetometer == nullptr) {
+        if (!RegisterSensorInterface<MagnetometerSensorChannelInterface>(KeySensor::Magnetometer)) {
             EventChannelNull(KeyChannel::Magnetometer);
             return;
         }
 
         m_ifaceMagnetometer = MagnetometerSensorChannelInterface::interface(KeySensor::Magnetometer);
 
-        if (!m_ifaceMagnetometer)
-        {
+        if (!m_ifaceMagnetometer) {
             EventChannelNull(KeyChannel::Magnetometer);
             return;
         }
@@ -504,12 +497,9 @@ void SensorsPlusAuroraPlugin::EnableSensorMagnetometer()
 
 void SensorsPlusAuroraPlugin::DisableSensorMagnetometer()
 {
-    if (m_ifaceMagnetometer == nullptr)
-    {
-        return;
+    if (m_ifaceMagnetometer) {
+        m_ifaceMagnetometer->stop();
     }
-
-    m_ifaceMagnetometer->stop();
 }
 
 void SensorsPlusAuroraPlugin::EventSensorMagnetometer(const MagneticField &data)