diff --git a/Start_Windows/makefile b/Start_Windows/makefile
index 146a8c6..6618f5b 100644
--- a/Start_Windows/makefile
+++ b/Start_Windows/makefile
@@ -1,46 +1,51 @@
-CC = gcc
-CFLAGS = -g -Wall -I$(raylibfolder)
-LDFLAGS = -lopengl32 -lgdi32 -lwinmm
+# --------------------------
+# Variablen
+# --------------------------
+raylib_folder = ./raylib
+unity_folder = ./unity
 BINARIES = ./windows
 
-raylib_folder = ./raylib
-unityfolder = ./unity
-
-# --------------------------
-# initiales Spiel bauen
-# --------------------------
-wordsalad_initial:
-	$(CC) -o wordsalad_initial $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS)
-
-
-# --------------------------
-# Normales Spiel bauen
-# --------------------------
-all: main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a
-	$(CC) $(CFLAGS) -o wordsalad main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a $(LDFLAGS)
-
-main.o: main.c
-	$(CC) -c $(CFLAGS) main.c
-
-input.o: input.c
-	$(CC) -c $(CFLAGS)input.c
-
-game.o: game.c
-	$(CC) -c $(CFLAGS) game.c
-
-graphicalGame.o: graphicalGame.c
-	$(CC) -I$(raylib_folder) -c $(CFLAGS) graphicalGame.c
-
-# --------------------------
-# Unit Tests
-# --------------------------
+CC = gcc
+CFLAGS = -g -Wall -I$(raylib_folder)
+LDFLAGS = -lopengl32 -lgdi32 -lwinmm
 TEST_BIN = runTests
 
-test: input.o game.o unit_tests.c
-	$(CC) $(CFLAGS) -I$(unityfolder) -o $(TEST_BIN) input.o game.o unit_tests.c $(BINARIES)/libunity.a
+# --------------------------
+# Ziel: Normales Spiel bauen
+# --------------------------
+all: wordsalad
+
+wordsalad: main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a
+    $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+
+main.o: main.c
+    $(CC) -c $(CFLAGS) $< -o $@
+
+input.o: input.c
+    $(CC) -c $(CFLAGS) $< -o $@
+
+game.o: game.c
+    $(CC) -c $(CFLAGS) $< -o $@
+
+graphicalGame.o: graphicalGame.c
+    $(CC) -c $(CFLAGS) $< -o $@
 
 # --------------------------
-# Clean
+# Ziel: Initiales Spiel bauen
+# --------------------------
+wordsalad_initial:
+    $(CC) -o $@ $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS)
+
+# --------------------------
+# Ziel: Unit Tests
+# --------------------------
+test: $(TEST_BIN)
+
+$(TEST_BIN): input.o game.o unit_tests.c
+    $(CC) $(CFLAGS) -I$(unity_folder) -o $@ input.o game.o unit_tests.c $(BINARIES)/libunity.a
+
+# --------------------------
+# Ziel: Aufräumen
 # --------------------------
 clean:
-	del /f *.o *.exe
+    rm -f *.o wordsalad wordsalad_initial $(TEST_BIN)