diff --git a/dbus-batrium-native/dbus-batrium-native.py b/dbus-batrium-native/dbus-batrium-native.py
index 2c29445..1596dab 100644
--- a/dbus-batrium-native/dbus-batrium-native.py
+++ b/dbus-batrium-native/dbus-batrium-native.py
@@ -283,10 +283,7 @@ class DbusBatteryService:
                     self._dbusservice['/TimeToGo'] = self._bat.TimeToFull
                 else:
                     self._dbusservice['/TimeToGo'] = None
-            else :
-                self._dbusservice['/TimeToGo'] = None
-                
-            if self._bat.current < -1:
+            elif self._bat.current < -1:
                 #discharging
                 self._dbusservice['/ConsumedAmphours'] += abs(self._bat.current * 0.016667) #Ah
                 self._dbusservice['/History/TotalAhDrawn'] += abs(self._bat.current * 0.016667) #Ah