diff --git a/src/main/java/ch/zhaw/pm2/racetrack/Game.java b/src/main/java/ch/zhaw/pm2/racetrack/Game.java
index cdac7ab..94af85b 100644
--- a/src/main/java/ch/zhaw/pm2/racetrack/Game.java
+++ b/src/main/java/ch/zhaw/pm2/racetrack/Game.java
@@ -128,10 +128,9 @@ public class Game implements GameSpecification {
         if (onlyOneCarLeft()) {
             return currentCarIndex;
         }
-        List<Car> cars = track.getCars();
-        for (Car car : cars) {
-            if (car.getWinPoints() == 1) {
-                return car.getID(); // TODO: Index not ID
+        for (int i = 0; i < track.getCarCount(); i++) {
+            if (track.getCar(i).getWinPoints() == 1) {
+                return i;
             }
         }
         return NO_WINNER;
@@ -294,8 +293,8 @@ public class Game implements GameSpecification {
         List<PositionVector> path = calculatePath(start, finish);
         for (PositionVector point : path) {
             if (track.getSpaceType(point) != null)
-            {
-                switch (track.getSpaceType(point)) { //TODO: Case null
+                {
+                switch (track.getSpaceType(point)) {
                     case FINISH_UP:
                         if (start.getY() < finish.getY()) {
                             track.getCar(carIndex).increaseWinPoints();
@@ -324,9 +323,9 @@ public class Game implements GameSpecification {
                             track.getCar(carIndex).increaseWinPoints();
                         }
                         break;
-                }
+                    }
 
-            }
+                }
         }
     }