diff --git a/go-api/main.go b/go-api/main.go
index d9bf7f5..2006408 100644
--- a/go-api/main.go
+++ b/go-api/main.go
@@ -4,8 +4,6 @@ import (
 	"encoding/json"
 	"log"
 	"net/http"
-	"os"
-	"strconv"
 )
 
 type ErrorResponse struct {
@@ -28,7 +26,7 @@ func handler(w http.ResponseWriter, r *http.Request) {
 	if (code != 200) {
 		json.NewEncoder(w).Encode(ErrorResponse{
 			Message: "There has been an error.",
-			StatusCode: code,
+			StatusCode: 400,
 		})
 	} else {
 		json.NewEncoder(w).Encode(SuccessResponse{
@@ -37,31 +35,6 @@ func handler(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func getResponseCode(r *http.Request) int {
-	// If the `force-fail` header is set, get and return its value.
-	if failCode := r.Header.Get("force-fail"); failCode != "" {
-		log.Println("`force-fail` header set...")
-
-		if code, err := strconv.Atoi(failCode); err == nil {
-			log.Printf("Setting the response code to %d...", code)
-
-			return code
-		}
-	}
-
-	return http.StatusOK
-}
-
-func getPort() string {
-	port := os.Getenv("PORT")
-
-	if port != "" {
-		return port
-	}
-
-	return "8080"
-}
-
 func main() {
 	http.HandleFunc("/", handler)
 
diff --git a/go-api/utils.go b/go-api/utils.go
new file mode 100644
index 0000000..7d88695
--- /dev/null
+++ b/go-api/utils.go
@@ -0,0 +1,33 @@
+package main
+
+import (
+	"log"
+	"net/http"
+	"os"
+	"strconv"
+)
+
+func getPort() string {
+	port := os.Getenv("PORT")
+
+	if port != "" {
+		return port
+	}
+
+	return "8080"
+}
+
+func getResponseCode(r *http.Request) int {
+	// If the `force-fail` header is set, get and return its value.
+	if failCode := r.Header.Get("force-fail"); failCode != "" {
+		log.Println("`force-fail` header set...")
+
+		if code, err := strconv.Atoi(failCode); err == nil {
+			log.Printf("Setting the response code to %d...", code)
+
+			return code
+		}
+	}
+
+	return http.StatusOK
+}