diff --git a/src/colorDetection/ColorDetection.cpp b/src/colorDetection/ColorDetection.cpp
index eddbaf2..19dcde9 100644
--- a/src/colorDetection/ColorDetection.cpp
+++ b/src/colorDetection/ColorDetection.cpp
@@ -98,6 +98,6 @@ float ColorDetection::modelCurrentConsumption() {
 };
 
 float ColorDetection::modelChargeConsumption(uint16_t durationMs) {
-  return PowerParameters::CurrentConsumptions::CURRENT_SENSOR_RGBW *
-         durationMs * 10e6;
+  return (PowerParameters::CurrentConsumptions::CURRENT_SENSOR_RGBW *
+         durationMs) / 10e6f;
 }
\ No newline at end of file
diff --git a/src/infraredLight/InfraredLED.cpp b/src/infraredLight/InfraredLED.cpp
index 53473a0..a9b9b06 100644
--- a/src/infraredLight/InfraredLED.cpp
+++ b/src/infraredLight/InfraredLED.cpp
@@ -115,10 +115,10 @@ float InfraredLED::modelChargeConsumptionOn(uint16_t durationMs) {
   constexpr float resolution = 1 << DUTY_RESOLUTION;
   if (this->ledPin == IR_BOTTOM_PIN) {
     return durationMs *
-           PowerParameters::CurrentConsumptions::CURRENT_LED_IR_BOTTOM * 10e6;
+           (PowerParameters::CurrentConsumptions::CURRENT_LED_IR_BOTTOM) / 10e6f;
   } else if (this->ledPin == IR_FRONT_PIN) {
     return durationMs *
-           PowerParameters::CurrentConsumptions::CURRENT_LED_IR_FRONT *  10e6;
+           (PowerParameters::CurrentConsumptions::CURRENT_LED_IR_FRONT) / 10e6f;
   }
   return NAN;
 }
@@ -126,6 +126,6 @@ float InfraredLED::modelChargeConsumptionOn(uint16_t durationMs) {
 float InfraredLED::modelChargeConsumptionSendFrequency(uint16_t durationMs) {
   // Float to force float division without casting
 
-  return durationMs * this->modelCurrentConsumption(DUTY_CYCLE_FREQUENCY) *
-         10e6;
+  return (durationMs * this->modelCurrentConsumption(DUTY_CYCLE_FREQUENCY)) /
+         10e6f;
 }
diff --git a/src/lightDetection/LightDetection.cpp b/src/lightDetection/LightDetection.cpp
index 3bbf253..498d2c2 100644
--- a/src/lightDetection/LightDetection.cpp
+++ b/src/lightDetection/LightDetection.cpp
@@ -145,6 +145,7 @@ float LightDetection::modelCurrentConsumption(photoTransistors sensor){
     }
 };
 
-float LightDetection::modelChargeConsumptionOn(photoTransistors sensor, uint16_t durationMs) {
-    return LightDetection::modelCurrentConsumption(sensor) * durationMs * 10e6;
+float LightDetection::modelChargeConsumptionOn(photoTransistors sensor,
+                                               uint16_t durationMs) {
+  return (LightDetection::modelCurrentConsumption(sensor) * durationMs) / 10e6f;
 }
\ No newline at end of file
diff --git a/src/motion/Motor.cpp b/src/motion/Motor.cpp
index 825620c..ea6e9db 100644
--- a/src/motion/Motor.cpp
+++ b/src/motion/Motor.cpp
@@ -74,5 +74,5 @@ float Motor::modelCurrentConsumption(uint16_t duty) {
 }
 
 float Motor::modelChargeConsumption(uint16_t duty, uint16_t durationMs) {
-  return modelCurrentConsumption(duty) * durationMs * 10e6;
+  return (modelCurrentConsumption(duty) * durationMs) / 10e6f;
 }
diff --git a/src/motionDetection/MotionDetection.cpp b/src/motionDetection/MotionDetection.cpp
index e3844f4..178ef9f 100644
--- a/src/motionDetection/MotionDetection.cpp
+++ b/src/motionDetection/MotionDetection.cpp
@@ -299,7 +299,6 @@ float MotionDetection::modelCurrentConsumption(){
     return PowerParameters::CurrentConsumptions::CURRENT_IMU;
 }
 
-
-float MotionDetection::modelChargeConsumption(uint16_t durationMs){
-    return this->modelCurrentConsumption() * durationMs * 10e6;
+float MotionDetection::modelChargeConsumption(uint16_t durationMs) {
+  return (this->modelCurrentConsumption() * durationMs) / 10e6f;
 }
\ No newline at end of file
diff --git a/src/multiColorLight/MultiColorLight.cpp b/src/multiColorLight/MultiColorLight.cpp
index b4ec24c..28b9024 100644
--- a/src/multiColorLight/MultiColorLight.cpp
+++ b/src/multiColorLight/MultiColorLight.cpp
@@ -200,7 +200,7 @@ float MultiColorLight::modelChargeConsumption(uint8_t index, uint32_t color,
   }
   uint32_t normalizedColor = normalizeColor(color);
   float ledConsumption = modelCurrentConsumption(normalizedColor);
-  return ledConsumption * durationMs * 10e6;
+  return (ledConsumption * durationMs) / 10e6f;
 };
 
 float MultiColorLight::modelChargeConsumption(leds leds, uint32_t color,
@@ -235,6 +235,7 @@ float MultiColorLight::modelChargeConsumption(leds leds, uint32_t color,
     // TODO logging
     break;
   }
+  return ledsConsumption; 
 };
 
 float MultiColorLight::modelChargeConsumption(leds leds, uint8_t red,