diff --git a/info.json b/info.json
index efdd81e..82cbbc8 100644
--- a/info.json
+++ b/info.json
@@ -1,6 +1,6 @@
 {
   "name": "factorio-metrics-exporter",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "title": "Prometheus Metrics Exporter",
   "author": "Jan Grießhaber",
   "contact": "jan@griesshaber.systems",
diff --git a/train-stats.lua b/train-stats.lua
index 742ca5d..8b3b192 100644
--- a/train-stats.lua
+++ b/train-stats.lua
@@ -34,10 +34,22 @@ function GetTrainStates()
     local trainsProblems = 0
     local trainsManual = 0
     for _, train in pairs(storage.trains) do
-        if train.state == defines.train_state.wait_station or defines.train_state.destination_full  or defines.train_state.no_schedule then trainsWaiting = trainsWaiting + 1 end
-        if train.state == defines.train_state.on_the_path or defines.train_state.arrive_signal or defines.train_state.wait_signal  then trainsDriving = trainsDriving + 1 end
-        if train.state == defines.train_state.manual_control or defines.train_state.manual_control_stop then trainsManual = trainsManual + 1 end
-        if train.state == defines.train_state.no_path then trainsProblems = trainsProblems + 1 end
+        if train.state == defines.train_state.wait_station
+        or train.state ==defines.train_state.destination_full
+        or train.state == defines.train_state.no_schedule
+        then trainsWaiting = trainsWaiting + 1 end
+
+        if train.state == defines.train_state.on_the_path
+        or train.state ==defines.train_state.arrive_signal
+        or train.state ==defines.train_state.wait_signal
+        then trainsDriving = trainsDriving + 1 end
+
+        if train.state == defines.train_state.manual_control 
+        or train.state == defines.train_state.manual_control_stop 
+        then trainsManual = trainsManual + 1 end
+
+        if train.state == defines.train_state.no_path 
+        then trainsProblems = trainsProblems + 1 end
     end
     return ("---trains-states---\n%d:%d:%d:%d"):format(trainsDriving,trainsManual,trainsProblems,trainsWaiting)
 end