diff --git a/cmd/server.c b/cmd/server.c
index 73badd1..278a6c4 100644
--- a/cmd/server.c
+++ b/cmd/server.c
@@ -8,15 +8,15 @@
 // Local Includes
 #include "httpStruct.h"
 #include "socketHelp.h"
+#include "returnRequest.h"
 
 #define PORT 8080
 
 int parseHTTPRequest(char buffer[], struct HTTPRequest *r) {
 	char temp[1];
-	char *token;
+	char *token = calloc(8, sizeof(char));
 	int line = 0;
-	char * checkLine;
-	checkLine = malloc(1000);
+	char *checkLine = calloc(1000, sizeof(char));;
 
 	for (int i = 0; i < strlen(buffer); i++) {
 		temp[0] = buffer[i];
@@ -63,28 +63,13 @@ int parseHTTPRequest(char buffer[], struct HTTPRequest *r) {
 	return 0;
 }
 
-int returnRequest(int socket, char *message) {
-	send(socket, message, strlen(message), 0);
-	return 0;
-}
-
-int return200Request(int socket) {
-	char *message = "HTTP/1.1 200 OK\nContent-Length: 6\nConnection: close\n\nhello\n";
-	return returnRequest(socket, message);
-}
-
-int return404Request(int socket) {
-	char *message = "HTTP/1.1 404 Not Found\nContent-Length: 12\nConnection: close\n\n404 Request\n";
-	return returnRequest(socket, message);
-}
-
 int handleRequest(char buffer[], int socket) {
 	struct HTTPRequest r; // Holds relevant HTTP request information
 	int checkerr = 0;
 	// Grabbing relevant information out of request
 	checkerr = parseHTTPRequest(buffer, &r);
 	if (checkerr != 0) { // Checking for HTTP parsing error
-		perror("Badness!!!");
+		perror("Error parsing");
 		return return404Request(socket);
 	}
 	// Return response to socket
diff --git a/include/returnRequest.h b/include/returnRequest.h
new file mode 100644
index 0000000..5349aa2
--- /dev/null
+++ b/include/returnRequest.h
@@ -0,0 +1,3 @@
+int returnRequest(int socket, char *message, int status);
+int return200Request(int socket);
+int return404Request(int socket);
diff --git a/src/returnRequest.c b/src/returnRequest.c
new file mode 100644
index 0000000..d1f6772
--- /dev/null
+++ b/src/returnRequest.c
@@ -0,0 +1,18 @@
+#include <string.h>
+#include <sys/socket.h>
+
+int returnRequest(int socket, char *message, int status) {
+	send(socket, message, strlen(message), 0);
+	return 0;
+}
+
+int return200Request(int socket) {
+	char *message = "HTTP/1.1 200 OK\nContent-Length: 6\nConnection: close\n\nhello\n";
+	return returnRequest(socket, message, 200);
+}
+
+int return404Request(int socket) {
+	char *message = "HTTP/1.1 404 Not Found\nContent-Length: 12\nConnection: close\n\n404 Request\n";
+	return returnRequest(socket, message, 400);
+}
+