diff --git a/.gitignore b/.gitignore
index 5b1f79c..942fdf4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,11 @@
 
 .env
 Nourybot
+Nourybot.out
 Nourybot-Api
+Nourybot-Api.out
+NourybotApi
+NourybotApi.out
 nourybot-api
 Nourybot-Web
 nourybot-web
\ No newline at end of file
diff --git a/Makefile b/Makefile
index af426a9..41ca60c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,18 @@
 BINARY_NAME=Nourybot.out
 BINARY_NAME_API=NourybotApi.out
 
-jqapi:
-	cd cmd/api && go build -o Nourybot-Api && ./Nourybot-Api | jq
-  go build -o ${BINARY_NAME_API} cmd/api
-	./${BINARY_NAME} | jq
-
 xd:
-  go build -o ${BINARY_NAME} cmd/bot/main.go
-	./${BINARY_NAME} -env="dev"
+	cd cmd/bot && go build -o ${BINARY_NAME} && ./${BINARY_NAME} -env="dev"
 
 xdprod:
-  go build -o ${BINARY_NAME} cmd/bot/main.go
-	./${BINARY_NAME} -env="prod"
+	cd cmd/bot && go build -o ${BINARY_NAME} && ./${BINARY_NAME} -env="prod"
 
 jq:
-  go build -o ${BINARY_NAME} cmd/bot/main.go
-  ./${BINARY_NAME} -env="dev" | jq
+	cd cmd/bot && go build -o ${BINARY_NAME} && ./${BINARY_NAME} -env="dev" | jq
 
 jqprod:
-  go build -o ${BINARY_NAME} cmd/bot/main.go
-  ./${BINARY_NAME} -env="prod" | jq
+	cd cmd/bot && go build -o ${BINARY_NAME} && ./${BINARY_NAME} -env="prod" | jq
+
+jqapi:
+	go build -o ${BINARY_NAME_API} cmd/api && ./${BINARY_NAME} | jq