diff --git a/src/ise_display_definitions.hpp b/src/ise_display_definitions.hpp
index 3bbd03d..6a7d034 100644
--- a/src/ise_display_definitions.hpp
+++ b/src/ise_display_definitions.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 //start definition
-#define CT_RMS_VOLTAGE 220
+#define CT_RMS_VOLTAGE 220.0
 #define CT_PIN_LIGHT_PHASE1 0
 #define CT_PIN_LIGHT_PHASE2 1
 #define CT_PIN_SOCKET 2
diff --git a/src/main.cpp b/src/main.cpp
index 27e02e9..2754244 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,14 +7,14 @@ RemoteVariable weather = RemoteVariable();
 RemoteVariable pm_switch = RemoteVariable();
 RemoteVariable pm_fan_speed = RemoteVariable();
 
-AnalogCard AnalogCard = AnalogCard();
-float *voltage = CT_RMS_VOLTAGE;
-CurrentTransformerCard ct_light_phase1 = CurrentTransformerCard(&AnalogCard, CT_PIN_AC_PHASE1, &voltage, &adcToCurrent, 1000);
-CurrentTransformerCard ct_light_phase2 = CurrentTransformerCard(&AnalogCard, CT_PIN_AC_PHASE2, &voltage, &adcToCurrent, 1000);
-CurrentTransformerCard ct_socket = CurrentTransformerCard(&AnalogCard, CT_PIN_SOCKET, &voltage, &adcToCurrent, 1000);
-CurrentTransformerCard ct_ac_phase1 = CurrentTransformerCard(&AnalogCard, CT_PIN_AC_PHASE1, &voltage, &adcToCurrent, 1000);
-CurrentTransformerCard ct_ac_phase2 = CurrentTransformerCard(&AnalogCard, CT_PIN_AC_PHASE2, &voltage, &adcToCurrent, 1000);
-CurrentTransformerCard ct_ac_phase3 = CurrentTransformerCard(&AnalogCard, CT_PIN_AC_PHASE3, &voltage, &adcToCurrent, 1000);
+AnalogCard analogCard = AnalogCard();
+float voltage = CT_RMS_VOLTAGE;
+CurrentTransformerCard ct_light_phase1 = CurrentTransformerCard(&analogCard, CT_PIN_AC_PHASE1, &voltage, &adcToCurrent, 1000);
+CurrentTransformerCard ct_light_phase2 = CurrentTransformerCard(&analogCard, CT_PIN_AC_PHASE2, &voltage, &adcToCurrent, 1000);
+CurrentTransformerCard ct_socket = CurrentTransformerCard(&analogCard, CT_PIN_SOCKET, &voltage, &adcToCurrent, 1000);
+CurrentTransformerCard ct_ac_phase1 = CurrentTransformerCard(&analogCard, CT_PIN_AC_PHASE1, &voltage, &adcToCurrent, 1000);
+CurrentTransformerCard ct_ac_phase2 = CurrentTransformerCard(&analogCard, CT_PIN_AC_PHASE2, &voltage, &adcToCurrent, 1000);
+CurrentTransformerCard ct_ac_phase3 = CurrentTransformerCard(&analogCard, CT_PIN_AC_PHASE3, &voltage, &adcToCurrent, 1000);
 
 const char *mode_names[] = {"off", "cool", "fan_only", "dry"};
 const char *fan_speed_names[] = {"auto", "high", "medium", "low"};
@@ -139,12 +139,12 @@ void setup()
   espmega.installCard(7, &ct_ac_phase1);
   espmega.installCard(8, &ct_ac_phase2);
   espmega.installCard(9, &ct_ac_phase3);
-  espmega->iot.registerCard(4);
-  espmega->iot.registerCard(5);
-  espmega->iot.registerCard(6);
-  espmega->iot.registerCard(7);
-  espmega->iot.registerCard(8);
-  espmega->iot.registerCard(9);
+  espmega.iot->registerCard(4);
+  espmega.iot->registerCard(5);
+  espmega.iot->registerCard(6);
+  espmega.iot->registerCard(7);
+  espmega.iot->registerCard(8);
+  espmega.iot->registerCard(9);
   // auto binded_display_update_on_pm25_out = std::bind(&display_update,0,std::placeholders::_1);
   // auto binded_display_update_on_pm25_in = std::bind(&display_update,1,std::placeholders::_1);
   // auto binded_display_update_on_temp_out = std::bind(&display_update,2,std::placeholders::_1);
diff --git a/src/main.hpp b/src/main.hpp
index 7d3ad06..d59c005 100644
--- a/src/main.hpp
+++ b/src/main.hpp
@@ -46,4 +46,4 @@ void tempoutupdatedisplay(char* value);
 void weatherupdatedisplay(char* value);
 void pmfanspeedupdatedisplay(char* value);
 void pmswitchupdatedisplay(char* value);
-float adc2current(uint16_t adc_value);
\ No newline at end of file
+float adcToCurrent(uint16_t adc_value);
\ No newline at end of file