diff --git a/Makefile b/Makefile
index 91ac33b..dc6237e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,18 @@
+SOURCEFILES = webserver.go admin.go generate_rss.go setup.go configreader.go
+
 all:	
-	go build webserver.go admin.go generate_rss.go setup.go configreader.go
+	go build $(SOURCEFILES)
 
-windows: admin.go webserver.go generate_rss.go
-	go build -o pogoapp.exe webserver.go admin.go generate_rss.go setup.go
+windows:
+	go build -o pogoapp.exe $(SOURCEFILES)
 
-linux: admin.go webserver.go generate_rss.go
-	go build -o pogoapp webserver.go admin.go generate_rss.go setup.go
+linux:
+	go build -o pogoapp $(SOURCEFILES)
 
 install:
 	go get github.com/gmemstr/feeds
 	go get github.com/fsnotify/fsnotify
-	go get github.com/spf13/viper
 	go get github.com/gorilla/mux
 
 docker:
 	docker build .
-
-and run:
-	go build webserver.go admin.go generate_rss.go setup.go
-	./pogoapp.exe
\ No newline at end of file