diff --git a/NEWS b/NEWS
index e66ecc5..986796a 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ Evisum 0.2.6
    * Fix some memory leaks.
    * Battery names (where applicable).
    * Various small tidying.
+   * Use Eina helpers where applicable.
 
 ============
 Evisum 0.2.4
diff --git a/src/system.c b/src/system.c
index f7286bd..1b36ba7 100644
--- a/src/system.c
+++ b/src/system.c
@@ -1155,7 +1155,8 @@ system_temperature_cpu_get(void)
 void
 system_power_state_get(power_t *power)
 {
-   _power_state_get(power);
+   if (_power_battery_count_get(power))
+     _power_state_get(power);
 }
 
 bool
diff --git a/src/system.h b/src/system.h
index 3eebca7..014bbee 100644
--- a/src/system.h
+++ b/src/system.h
@@ -25,21 +25,21 @@ typedef struct
 #define MAX_BATTERIES 10
 typedef struct
 {
-   double charge_full;
-   double charge_current;
+   double  charge_full;
+   double  charge_current;
    uint8_t percent;
 } bat_t;
 
 typedef struct
 {
-   bool    have_ac;
-   int     battery_count;
+   bool     have_ac;
+   int      battery_count;
 
    bat_t  **batteries;
 
    char    *battery_names[MAX_BATTERIES];
-   int    *bat_mibs[MAX_BATTERIES];
-   int     ac_mibs[5];
+   int     *bat_mibs[MAX_BATTERIES];
+   int      ac_mibs[5];
 } power_t;
 
 typedef struct results_t results_t;