diff --git a/src/V1_TeslaMateAPICarsChargesDetails.go b/src/V1_TeslaMateAPICarsChargesDetails.go
index b206627..c7cdbf2 100644
--- a/src/V1_TeslaMateAPICarsChargesDetails.go
+++ b/src/V1_TeslaMateAPICarsChargesDetails.go
@@ -320,7 +320,7 @@ func TeslaMateAPICarsChargesDetailsV1(c *gin.Context) {
 	if gin.IsDebugging() {
 		log.Printf("[debug] TeslaMateAPICarsChargesDetailsV1 returned /cars/%d/charges/%d data:", CarID, ChargeID)
 		js, _ := json.Marshal(jsonData)
-		log.Printf("%s\n", js)
+		log.Printf("[debug] %s\n", js)
 	}
 
 	// return jsonData
diff --git a/src/v1_TeslaMateAPICars.go b/src/v1_TeslaMateAPICars.go
index 3d79d7a..26e360e 100644
--- a/src/v1_TeslaMateAPICars.go
+++ b/src/v1_TeslaMateAPICars.go
@@ -184,7 +184,7 @@ func TeslaMateAPICarsV1(c *gin.Context) {
 			log.Println("[debug] TeslaMateAPICarsV1 returned /cars data:")
 		}
 		js, _ := json.Marshal(jsonData)
-		log.Printf("%s\n", js)
+		log.Printf("[debug] %s\n", js)
 	}
 
 	// return jsonData
diff --git a/src/v1_TeslaMateAPICarsCharges.go b/src/v1_TeslaMateAPICarsCharges.go
index 0558685..9878818 100644
--- a/src/v1_TeslaMateAPICarsCharges.go
+++ b/src/v1_TeslaMateAPICarsCharges.go
@@ -200,7 +200,7 @@ func TeslaMateAPICarsChargesV1(c *gin.Context) {
 	if gin.IsDebugging() {
 		log.Printf("[debug] TeslaMateAPICarsChargesV1 returned /cars/%d/charges data:", CarID)
 		js, _ := json.Marshal(jsonData)
-		log.Printf("%s\n", js)
+		log.Printf("[debug] %s\n", js)
 	}
 
 	// return jsonData
diff --git a/src/v1_TeslaMateAPICarsDrives.go b/src/v1_TeslaMateAPICarsDrives.go
index df419cd..b9def50 100644
--- a/src/v1_TeslaMateAPICarsDrives.go
+++ b/src/v1_TeslaMateAPICarsDrives.go
@@ -248,7 +248,7 @@ func TeslaMateAPICarsDrivesV1(c *gin.Context) {
 	if gin.IsDebugging() {
 		log.Printf("[debug] TeslaMateAPICarsDrivesV1 returned /cars/%d/drives data:", CarID)
 		js, _ := json.Marshal(jsonData)
-		log.Printf("%s\n", js)
+		log.Printf("[debug] %s\n", js)
 	}
 
 	// return jsonData
diff --git a/src/v1_TeslaMateAPICarsDrivesDetails.go b/src/v1_TeslaMateAPICarsDrivesDetails.go
index c58d38a..785e198 100644
--- a/src/v1_TeslaMateAPICarsDrivesDetails.go
+++ b/src/v1_TeslaMateAPICarsDrivesDetails.go
@@ -383,7 +383,7 @@ func TeslaMateAPICarsDrivesDetailsV1(c *gin.Context) {
 	if gin.IsDebugging() {
 		log.Printf("[debug] TeslaMateAPICarsDrivesDetailsV1 returned /cars/%d/drives/%d data:", CarID, DriveID)
 		js, _ := json.Marshal(jsonData)
-		log.Printf("%s\n", js)
+		log.Printf("[debug] %s\n", js)
 	}
 
 	// return jsonData
diff --git a/src/v1_TeslaMateAPICarsStatus.go b/src/v1_TeslaMateAPICarsStatus.go
index 7599969..e9c3313 100644
--- a/src/v1_TeslaMateAPICarsStatus.go
+++ b/src/v1_TeslaMateAPICarsStatus.go
@@ -550,7 +550,7 @@ func TeslaMateAPICarsStatusV1(c *gin.Context) {
 	if gin.IsDebugging() {
 		log.Printf("[debug] TeslaMateAPICarsStatusV1 returned /cars/%d/status data:", CarID)
 		js, _ := json.Marshal(jsonData)
-		log.Printf("%s\n", js)
+		log.Printf("[debug] %s\n", js)
 	}
 
 	// return jsonData
diff --git a/src/v1_TeslaMateAPICarsUpdates.go b/src/v1_TeslaMateAPICarsUpdates.go
index 38461dd..7e6da9e 100644
--- a/src/v1_TeslaMateAPICarsUpdates.go
+++ b/src/v1_TeslaMateAPICarsUpdates.go
@@ -126,7 +126,7 @@ func TeslaMateAPICarsUpdatesV1(c *gin.Context) {
 	if gin.IsDebugging() {
 		log.Printf("[debug] TeslaMateAPICarsUpdatesV1 returned /cars/%d/updates data:", CarID)
 		js, _ := json.Marshal(jsonData)
-		log.Printf("%s\n", js)
+		log.Printf("[debug] %s\n", js)
 	}
 
 	// return jsonData
diff --git a/src/v1_TeslaMateAPIGlobalsettings.go b/src/v1_TeslaMateAPIGlobalsettings.go
index 269bcf7..305f9b7 100644
--- a/src/v1_TeslaMateAPIGlobalsettings.go
+++ b/src/v1_TeslaMateAPIGlobalsettings.go
@@ -129,7 +129,7 @@ func TeslaMateAPIGlobalsettingsV1(c *gin.Context) {
 	if gin.IsDebugging() {
 		log.Println("[debug] TeslaMateAPIGlobalsettingsV1 returned /cars data:")
 		js, _ := json.Marshal(jsonData)
-		log.Printf("%s\n", js)
+		log.Printf("[debug] %s\n", js)
 	}
 
 	// return jsonData
diff --git a/src/webserver.go b/src/webserver.go
index ebc6120..bb513ed 100644
--- a/src/webserver.go
+++ b/src/webserver.go
@@ -21,20 +21,23 @@ var db *sql.DB
 func main() {
 
 	// setting log parameters
-	// log.SetPrefix("[TeslaMateApi] ")
-	log.SetFlags(log.Ldate | log.Lmicroseconds | log.Lshortfile)
+	log.SetFlags(log.Ldate | log.Lmicroseconds)
+
+	// setting application to ReleaseMode if DEBUG_MODE is false
+	if getEnvAsBool("DEBUG_MODE", false) == false {
+		// setting GIN_MODE to ReleaseMode
+		gin.SetMode(gin.ReleaseMode)
+		log.Printf("[info] TeslaMateApi running in release mode.")
+	} else {
+		// setting GIN_MODE to DebugMode
+		gin.SetMode(gin.DebugMode)
+		log.Printf("[info] TeslaMateApi running in debug mode.")
+	}
 
 	// init of API with connection to database
 	initDBconnection()
 	defer db.Close()
 
-	// setting application to ReleaseMode if DEBUG_MODE is false
-	if getEnvAsBool("DEBUG_MODE", false) == false {
-		gin.SetMode(gin.ReleaseMode)
-	} else {
-		gin.SetMode(gin.DebugMode)
-	}
-
 	// kicking off Gin in value r
 	r := gin.Default()