diff --git a/VGT_Sub/module.php b/VGT_Sub/module.php
index 91fbb17..8beb248 100644
--- a/VGT_Sub/module.php
+++ b/VGT_Sub/module.php
@@ -8,9 +8,7 @@ class VGT_Sub extends IPSModule
     {
         parent::Create();
 
-        // ---------------------------------------------------------
-        // CONFIG PROPERTIES (for form.json)
-        // ---------------------------------------------------------
+        // -------- CONFIG PROPERTIES --------
         $this->RegisterPropertyString('DeviceID', '');
 
         $this->RegisterPropertyInteger('VarPowerProduction', 0);
@@ -20,13 +18,11 @@ class VGT_Sub extends IPSModule
         $this->RegisterPropertyInteger('MinSOC', 20);
         $this->RegisterPropertyInteger('MaxSOC', 80);
 
-        // ---------------------------------------------------------
-        // INTERNAL VARIABLES
-        // ---------------------------------------------------------
+        // -------- INTERNAL VARIABLES --------
         $this->RegisterVariableFloat('PowerSetpoint', 'Power Setpoint', '', 20);
-        $this->RegisterVariableFloat('PowerSetpointAbs', 'Power Setpoint (ABS)', '', 21);
-        $this->RegisterVariableFloat('PowerSetpointPositive', 'Power Setpoint Positive', '', 22);
-        $this->RegisterVariableFloat('PowerSetpointNegative', 'Power Setpoint Negative', '', 23);
+        $this->RegisterVariableFloat('PowerSetpointAbs', 'Power Setpoint ABS', '', 21);
+        $this->RegisterVariableFloat('PowerSetpointPositive', 'Power Setpoint +', '', 22);
+        $this->RegisterVariableFloat('PowerSetpointNegative', 'Power Setpoint -', '', 23);
 
         $this->RegisterVariableString('Strategy', 'Strategy', '', 24);
         $this->RegisterVariableString('RemoteControlPayload', 'Remote Control Payload', '', 25);
@@ -39,7 +35,7 @@ class VGT_Sub extends IPSModule
     {
         parent::ApplyChanges();
 
-        // MQTT Splitter verbinden
+        // Splitter verbinden
         $this->ConnectParent('{F7A0DD2E-7684-95C0-64C2-D2A9DC47577B}');
 
         $device = $this->ReadPropertyString('DeviceID');
@@ -49,22 +45,14 @@ class VGT_Sub extends IPSModule
         }
     }
 
-    // ---------------------------------------------------------
-    // REQUESTACTION (nur Setzen)
-    // ---------------------------------------------------------
     public function RequestAction($Ident, $Value)
     {
         $this->SetValue($Ident, $Value);
     }
 
-    // ---------------------------------------------------------
-    // MQTT SUBSCRIBE
-    // ---------------------------------------------------------
-    private function Subscribe(string $topic): void
+    private function Subscribe(string $topic)
     {
-        if (!$this->HasActiveParent()) {
-            return;
-        }
+        if (!$this->HasActiveParent()) return;
 
         $this->SendDataToParent(json_encode([
             'DataID' => '{A1B5C433-4F17-462D-AD71-383F5BBE4F5A}',
@@ -73,14 +61,9 @@ class VGT_Sub extends IPSModule
         ]));
     }
 
-    // ---------------------------------------------------------
-    // MQTT PUBLISH
-    // ---------------------------------------------------------
-    private function Publish(string $topic, string $payload): void
+    private function Publish(string $topic, string $payload)
     {
-        if (!$this->HasActiveParent()) {
-            return;
-        }
+        if (!$this->HasActiveParent()) return;
 
         $this->SendDataToParent(json_encode([
             'DataID'  => '{A1B5C433-4F17-462D-AD71-383F5BBE4F5A}',
@@ -90,40 +73,32 @@ class VGT_Sub extends IPSModule
         ]));
     }
 
-    // ---------------------------------------------------------
-    // RECEIVE MQTT DATA
-    // ---------------------------------------------------------
     public function ReceiveData($JSONString)
     {
         $data = json_decode($JSONString, true);
         if (!is_array($data)) return;
-
         if (($data['Type'] ?? '') !== 'MESSAGE') return;
 
-        $topic   = $data['Topic'];
-        $payload = $data['Payload'];
-        $device  = $this->ReadPropertyString('DeviceID');
+        $topic   = $data['Topic'] ?? '';
+        $payload = $data['Payload'] ?? '';
 
+        $device = $this->ReadPropertyString('DeviceID');
         if ($device === '') return;
 
-        // -----------------------------------------------
-        // FEEDBACK REQUEST
-        // -----------------------------------------------
+        // ---- FEEDBACK REQUEST ----
         if ($topic === "feedback-request/$device") {
 
             $this->SetValue('FeedbackRequestPayload', $payload);
 
-            $reply = $this->BuildFeedbackResponse();
-            $json  = json_encode($reply);
+            $response = $this->BuildFeedbackResponse();
+            $json     = json_encode($response);
 
             $this->SetValue('FeedbackResponsePayload', $json);
             $this->Publish("feedback-response/$device", $json);
             return;
         }
 
-        // -----------------------------------------------
-        // REMOTE CONTROL REQUEST
-        // -----------------------------------------------
+        // ---- REMOTE CONTROL REQUEST ----
         if ($topic === "remote-control-request/$device") {
 
             $this->SetValue('RemoteControlPayload', $payload);
@@ -131,18 +106,17 @@ class VGT_Sub extends IPSModule
             $json = json_decode($payload, true);
             if (!is_array($json)) return;
 
-            // Power Setpoint Handling
+            // Power Setpoint
             if (isset($json['power_setpoint'])) {
-                $ps = floatval($json['power_setpoint']);
-                $this->SetValue('PowerSetpoint', $ps);
+                $value = floatval($json['power_setpoint']);
+                $this->SetValue('PowerSetpoint', $value);
+                $this->SetValue('PowerSetpointAbs', abs($value));
 
-                $this->SetValue('PowerSetpointAbs', abs($ps));
-
-                if ($ps > 0) {
-                    $this->SetValue('PowerSetpointPositive', $ps);
+                if ($value > 0) {
+                    $this->SetValue('PowerSetpointPositive', $value);
                     $this->SetValue('PowerSetpointNegative', 0);
-                } elseif ($ps < 0) {
-                    $this->SetValue('PowerSetpointNegative', $ps);
+                } elseif ($value < 0) {
+                    $this->SetValue('PowerSetpointNegative', $value);
                     $this->SetValue('PowerSetpointPositive', 0);
                 } else {
                     $this->SetValue('PowerSetpointPositive', 0);
@@ -150,19 +124,14 @@ class VGT_Sub extends IPSModule
                 }
             }
 
-            // Strategy Handling
-            if (isset($json['strategy'])) {
+            if (isset($json['strategy']))
                 $this->SetValue('Strategy', $json['strategy']);
-            }
 
             $this->Publish("remote-control-response/$device", $payload);
         }
     }
 
-    // ---------------------------------------------------------
-    // FEEDBACK RESPONSE BUILDER
-    // ---------------------------------------------------------
-    private function BuildFeedbackResponse(): array
+    private function BuildFeedbackResponse()
     {
         $idProd = $this->ReadPropertyInteger('VarPowerProduction');
         $idSOC  = $this->ReadPropertyInteger('VarStateOfCharge');
@@ -171,18 +140,18 @@ class VGT_Sub extends IPSModule
         $min = $this->ReadPropertyInteger('MinSOC');
         $max = $this->ReadPropertyInteger('MaxSOC');
 
-        $soc = ($idSOC > 0) ? GetValue($idSOC) : 0;
+        $soc       = ($idSOC > 0) ? GetValue($idSOC) : 0;
         $isRunning = ($idRun > 0) ? GetValue($idRun) : false;
 
         $isReady = ($isRunning && ($soc >= $min) && ($soc <= $max));
 
         return [
-            'power_production' => ($idProd > 0) ? GetValue($idProd) : 0,
-            'is_running'       => $isRunning,
-            'state_of_charge'  => $soc,
-            'min_soc'          => $min,
-            'max_soc'          => $max,
-            'is_ready'         => $isReady
+            "power_production" => ($idProd > 0) ? GetValue($idProd) : 0,
+            "is_running"       => $isRunning,
+            "state_of_charge"  => $soc,
+            "min_soc"          => $min,
+            "max_soc"          => $max,
+            "is_ready"         => $isReady
         ];
     }
 }