diff --git a/cmd/gogitlabber/logging/debug.go b/cmd/gogitlabber/logging/debug.go
new file mode 100644
index 0000000..942ed2c
--- /dev/null
+++ b/cmd/gogitlabber/logging/debug.go
@@ -0,0 +1,21 @@
+package logging
+
+import (
+	"io"
+	"log"
+)
+
+var debug bool
+
+// Enables debug logging if set to true. Default is false.
+func SetDebug(debugSetting bool) {
+	debug = debugSetting
+	if !debug {
+		log.SetOutput(io.Discard)
+	}
+}
+
+// Returns the current debug value as a boolean.
+func GetDebug() bool {
+	return debug
+}
diff --git a/cmd/gogitlabber/logging/logging.go b/cmd/gogitlabber/logging/logging.go
index 62f0437..7a7a587 100644
--- a/cmd/gogitlabber/logging/logging.go
+++ b/cmd/gogitlabber/logging/logging.go
@@ -1,56 +1,25 @@
 package logging
 
 import (
-	"fmt"
-	"io"
 	"log"
 )
 
-// define application name used in prefix
-var applicationName = ""
-
-func SetAppName(name string) {
-	applicationName = name
-}
-
-func GetAppName() string {
-	return applicationName
-}
-
-var debug bool
-
-func SetDebug(debugSetting bool) {
-	debug = debugSetting
-	if !debug {
-		log.SetOutput(io.Discard)
-	}
-}
-
-func GetDebug() bool {
-	return debug
-}
-
 // Prints the formatted log, taking both a message (string) and optionally
 // an error as inputs.
-func Print(message string, err error) error {
+func Print(message string, err error) {
 	if debug {
+		log.Printf(applicationName+" | LOG: %v\n", message)
 		if err != nil {
-			log.Printf(applicationName+" | DEBUG: %v error: %v\n", message, err)
+			log.Printf(applicationName+" | ERROR: %v\n", err)
 		}
-		if err == nil {
-			log.Printf(applicationName+" | DEBUG: %v\n", message)
-		}
-	} else {
-		return fmt.Errorf("It seems you want to print a log while debug is off")
 	}
-	return nil
 }
 
 // Prints the fatal error and exits the application. Takes both the message and
 // optionally an error as inputs.
 func Fatal(message string, err error) {
-	if err != nil {
-		log.Fatalf(applicationName+" | FATAL: %v error: %v\n", message, err)
-	}
 	log.Fatalf(applicationName+" | FATAL: %v\n", message)
+	if err != nil {
+		log.Fatalf(applicationName+" | ERROR: %v\n", err)
+	}
 }
diff --git a/cmd/gogitlabber/logging/prefix.go b/cmd/gogitlabber/logging/prefix.go
new file mode 100644
index 0000000..c3edb00
--- /dev/null
+++ b/cmd/gogitlabber/logging/prefix.go
@@ -0,0 +1,15 @@
+package logging
+
+var applicationName = ""
+
+// Sets the application name prefix used in the logoutput. Example:
+// <applicationName> | ...
+func SetAppName(name string) {
+	applicationName = name
+}
+
+// Returns the logging prefix name as string.
+func GetAppName() string {
+	return applicationName
+}
+