diff --git a/components/panasonic_heatpump/sensor/__init__.py b/components/panasonic_heatpump/sensor/__init__.py
index 72145d1..6012670 100644
--- a/components/panasonic_heatpump/sensor/__init__.py
+++ b/components/panasonic_heatpump/sensor/__init__.py
@@ -28,92 +28,90 @@ from .. import (
     panasonic_heatpump_ns,
 )
 
-
 UNIT_LITRE_PER_MINUTE = "L/min"
 UNIT_ROTATIONS_PER_MINUTE = "r/min"
 UNIT_PRESSURE_KGFCM2 = "kgf/cm²"
 UNIT_BAR = "bar"
 ICON_FAN_SPEED = "mdi:fan"
 
-
-CONF_TOP1 = "top1"      # Pump Flow
-CONF_TOP5 = "top5"      # Main Inlet Temp
-CONF_TOP6 = "top6"      # Main Outlet Temp
-CONF_TOP7 = "top7"      # Main Target Temp
-CONF_TOP8 = "top8"      # Compressor Freq
-CONF_TOP9 = "top9"      # DHW Target Temp
-CONF_TOP10 = "top10"    # DHW Temp
-CONF_TOP11 = "top11"    # Operations Hours
-CONF_TOP12 = "top12"    # Operations Counter
-CONF_TOP14 = "top14"    # Outside Temp
-CONF_TOP15 = "top15"    # Heat Power Production
-CONF_TOP16 = "top16"    # Heat Power Consumption
-CONF_TOP21 = "top21"    # Outside Pipe Temp
-CONF_TOP22 = "top22"    # DHW Heat Delta
-CONF_TOP23 = "top23"    # Heat Delta
-CONF_TOP24 = "top24"    # Cool Delta
-CONF_TOP25 = "top25"    # DHW Holiday Shift Temp
-CONF_TOP27 = "top27"    # Z1 Heat Request Temp
-CONF_TOP28 = "top28"    # Z1 Cool Request Temp
-CONF_TOP29 = "top29"    # Z1 Heat Curve Target High Temp
-CONF_TOP30 = "top30"    # Z1 Heat Curve Target Low Temp
-CONF_TOP31 = "top31"    # Z1 Heat Curve Outside High Temp
-CONF_TOP32 = "top32"    # Z1 Heat Curve Outside Low Temp
-CONF_TOP33 = "top33"    # Room Thermostat Temp
-CONF_TOP34 = "top34"    # Z2 Heat Request Temp
-CONF_TOP35 = "top35"    # Z2 Cool Request Temp
-CONF_TOP36 = "top36"    # Z1 Water Temp
-CONF_TOP37 = "top37"    # Z2 Water Temp
-CONF_TOP38 = "top38"    # Cool Power Production
-CONF_TOP39 = "top39"    # Cool Power Consumption
-CONF_TOP40 = "top40"    # DHW Power Production
-CONF_TOP41 = "top41"    # DHW Power Consumption
-CONF_TOP42 = "top42"    # Z1 Water Target Temp
-CONF_TOP43 = "top43"    # Z2 Water Target Temp
-CONF_TOP45 = "top45"    # Room Holiday Shift Temp
-CONF_TOP46 = "top46"    # Buffer Temp
-CONF_TOP47 = "top47"    # Solar Temp
-CONF_TOP48 = "top48"    # Pool Temp
-CONF_TOP49 = "top49"    # Main Hex Outlet Temp
-CONF_TOP50 = "top50"    # Discharge Temp
-CONF_TOP51 = "top51"    # Inside Pipe Temp
-CONF_TOP52 = "top52"    # Defrost Temp
-CONF_TOP53 = "top53"    # Eva Outlet Temp
-CONF_TOP54 = "top54"    # Bypass Outlet Temp
-CONF_TOP55 = "top55"    # Ipm Temp
-CONF_TOP56 = "top56"    # Z1 Temp
-CONF_TOP57 = "top57"    # Z2 Temp
-CONF_TOP62 = "top62"    # Fan1 Motor Speed
-CONF_TOP63 = "top63"    # Fan2 Motor Speed
-CONF_TOP64 = "top64"    # High Pressure
-CONF_TOP65 = "top65"    # Pump Speed
-CONF_TOP66 = "top66"    # Low Pressure
-CONF_TOP67 = "top67"    # Compressor Current
-CONF_TOP70 = "top70"    # Sterilization Temp
-CONF_TOP71 = "top71"    # Sterilization Max Time
-CONF_TOP72 = "top72"    # Z1 Cool Curve Target High Temp
-CONF_TOP73 = "top73"    # Z1 Cool Curve Target Low Temp
-CONF_TOP74 = "top74"    # Z1 Cool Curve Outside High Temp
-CONF_TOP75 = "top75"    # Z1 Cool Curve Outside Low Temp
-CONF_TOP77 = "top77"    # Heating Off Outdoor Temp
-CONF_TOP78 = "top78"    # Heater On Outdoor Temp
-CONF_TOP79 = "top79"    # Heat To Cool Temp
-CONF_TOP80 = "top80"    # Cool To Heat Temp
-CONF_TOP82 = "top82"    # Z2 Heat Curve Target High Temp
-CONF_TOP83 = "top83"    # Z2 Heat Curve Target Low Temp
-CONF_TOP84 = "top84"    # Z2 Heat Curve Outside High Temp
-CONF_TOP85 = "top85"    # Z2 Heat Curve Outside Low Temp
-CONF_TOP86 = "top86"    # Z2 Cool Curve Target High Temp
-CONF_TOP87 = "top87"    # Z2 Cool Curve Target Low Temp
-CONF_TOP88 = "top88"    # Z2 Cool Curve Outside High Temp
-CONF_TOP89 = "top89"    # Z2 Cool Curve Outside Low Temp
-CONF_TOP90 = "top90"    # Room Heater Operations Hours
-CONF_TOP91 = "top91"    # DHW Heater Operations Hours
-CONF_TOP93 = "top93"    # Pump Duty
-CONF_TOP95 = "top95"    # Max Pump Duty
-CONF_TOP96 = "top96"    # Heater Delay Time
-CONF_TOP97 = "top97"    # Heater Start Delta
-CONF_TOP98 = "top98"    # Heater Stop Delta
+CONF_TOP1 = "top1"  # Pump Flow
+CONF_TOP5 = "top5"  # Main Inlet Temp
+CONF_TOP6 = "top6"  # Main Outlet Temp
+CONF_TOP7 = "top7"  # Main Target Temp
+CONF_TOP8 = "top8"  # Compressor Freq
+CONF_TOP9 = "top9"  # DHW Target Temp
+CONF_TOP10 = "top10"  # DHW Temp
+CONF_TOP11 = "top11"  # Operations Hours
+CONF_TOP12 = "top12"  # Operations Counter
+CONF_TOP14 = "top14"  # Outside Temp
+CONF_TOP15 = "top15"  # Heat Power Production
+CONF_TOP16 = "top16"  # Heat Power Consumption
+CONF_TOP21 = "top21"  # Outside Pipe Temp
+CONF_TOP22 = "top22"  # DHW Heat Delta
+CONF_TOP23 = "top23"  # Heat Delta
+CONF_TOP24 = "top24"  # Cool Delta
+CONF_TOP25 = "top25"  # DHW Holiday Shift Temp
+CONF_TOP27 = "top27"  # Z1 Heat Request Temp
+CONF_TOP28 = "top28"  # Z1 Cool Request Temp
+CONF_TOP29 = "top29"  # Z1 Heat Curve Target High Temp
+CONF_TOP30 = "top30"  # Z1 Heat Curve Target Low Temp
+CONF_TOP31 = "top31"  # Z1 Heat Curve Outside High Temp
+CONF_TOP32 = "top32"  # Z1 Heat Curve Outside Low Temp
+CONF_TOP33 = "top33"  # Room Thermostat Temp
+CONF_TOP34 = "top34"  # Z2 Heat Request Temp
+CONF_TOP35 = "top35"  # Z2 Cool Request Temp
+CONF_TOP36 = "top36"  # Z1 Water Temp
+CONF_TOP37 = "top37"  # Z2 Water Temp
+CONF_TOP38 = "top38"  # Cool Power Production
+CONF_TOP39 = "top39"  # Cool Power Consumption
+CONF_TOP40 = "top40"  # DHW Power Production
+CONF_TOP41 = "top41"  # DHW Power Consumption
+CONF_TOP42 = "top42"  # Z1 Water Target Temp
+CONF_TOP43 = "top43"  # Z2 Water Target Temp
+CONF_TOP45 = "top45"  # Room Holiday Shift Temp
+CONF_TOP46 = "top46"  # Buffer Temp
+CONF_TOP47 = "top47"  # Solar Temp
+CONF_TOP48 = "top48"  # Pool Temp
+CONF_TOP49 = "top49"  # Main Hex Outlet Temp
+CONF_TOP50 = "top50"  # Discharge Temp
+CONF_TOP51 = "top51"  # Inside Pipe Temp
+CONF_TOP52 = "top52"  # Defrost Temp
+CONF_TOP53 = "top53"  # Eva Outlet Temp
+CONF_TOP54 = "top54"  # Bypass Outlet Temp
+CONF_TOP55 = "top55"  # Ipm Temp
+CONF_TOP56 = "top56"  # Z1 Temp
+CONF_TOP57 = "top57"  # Z2 Temp
+CONF_TOP62 = "top62"  # Fan1 Motor Speed
+CONF_TOP63 = "top63"  # Fan2 Motor Speed
+CONF_TOP64 = "top64"  # High Pressure
+CONF_TOP65 = "top65"  # Pump Speed
+CONF_TOP66 = "top66"  # Low Pressure
+CONF_TOP67 = "top67"  # Compressor Current
+CONF_TOP70 = "top70"  # Sterilization Temp
+CONF_TOP71 = "top71"  # Sterilization Max Time
+CONF_TOP72 = "top72"  # Z1 Cool Curve Target High Temp
+CONF_TOP73 = "top73"  # Z1 Cool Curve Target Low Temp
+CONF_TOP74 = "top74"  # Z1 Cool Curve Outside High Temp
+CONF_TOP75 = "top75"  # Z1 Cool Curve Outside Low Temp
+CONF_TOP77 = "top77"  # Heating Off Outdoor Temp
+CONF_TOP78 = "top78"  # Heater On Outdoor Temp
+CONF_TOP79 = "top79"  # Heat To Cool Temp
+CONF_TOP80 = "top80"  # Cool To Heat Temp
+CONF_TOP82 = "top82"  # Z2 Heat Curve Target High Temp
+CONF_TOP83 = "top83"  # Z2 Heat Curve Target Low Temp
+CONF_TOP84 = "top84"  # Z2 Heat Curve Outside High Temp
+CONF_TOP85 = "top85"  # Z2 Heat Curve Outside Low Temp
+CONF_TOP86 = "top86"  # Z2 Cool Curve Target High Temp
+CONF_TOP87 = "top87"  # Z2 Cool Curve Target Low Temp
+CONF_TOP88 = "top88"  # Z2 Cool Curve Outside High Temp
+CONF_TOP89 = "top89"  # Z2 Cool Curve Outside Low Temp
+CONF_TOP90 = "top90"  # Room Heater Operations Hours
+CONF_TOP91 = "top91"  # DHW Heater Operations Hours
+CONF_TOP93 = "top93"  # Pump Duty
+CONF_TOP95 = "top95"  # Max Pump Duty
+CONF_TOP96 = "top96"  # Heater Delay Time
+CONF_TOP97 = "top97"  # Heater Start Delta
+CONF_TOP98 = "top98"  # Heater Stop Delta
 CONF_TOP102 = "top102"  # Solar On Delta
 CONF_TOP103 = "top103"  # Solar Off Delta
 CONF_TOP104 = "top104"  # Solar Frost Protection
@@ -132,12 +130,12 @@ CONF_TOP136 = "top136"  # Bivalent Advanced Start Delay
 CONF_TOP137 = "top137"  # Bivalent Advanced Stop Delay
 CONF_TOP138 = "top138"  # Bivalent Advanced DHW Delay
 
-CONF_XTOP0 = "xtop0"    # Heat Power Consumption Extra
-CONF_XTOP1 = "xtop1"    # Cool Power Consumption Extra
-CONF_XTOP2 = "xtop2"    # DHW Power Consumption Extra
-CONF_XTOP3 = "xtop3"    # Heat Power Production Extra
-CONF_XTOP4 = "xtop4"    # Cool Power Production Extra
-CONF_XTOP5 = "xtop5"    # DHW Power Production Extra
+CONF_XTOP0 = "xtop0"  # Heat Power Consumption Extra
+CONF_XTOP1 = "xtop1"  # Cool Power Consumption Extra
+CONF_XTOP2 = "xtop2"  # DHW Power Consumption Extra
+CONF_XTOP3 = "xtop3"  # Heat Power Production Extra
+CONF_XTOP4 = "xtop4"  # Cool Power Production Extra
+CONF_XTOP5 = "xtop5"  # DHW Power Production Extra
 
 TYPES = [
     CONF_TOP1,