diff --git a/database/database.go b/database/database.go
index c923ab8aa9d4b70b4b0c61e150dcce8a6b97c4b1..31b0312727c77e6abd3cd234b03435f3b1dd2d1d 100644
--- a/database/database.go
+++ b/database/database.go
@@ -35,7 +35,9 @@ func createDriver(uri, username, password string, encrypted bool) neo4j.Driver {
 		},
 	)
 
-	logError("failed creating database Driver", err)
+	if err != nil {
+		log.Info("failed creating database Driver:", err)
+	}
 
 	return driver
 }
@@ -45,7 +47,9 @@ func createSession(driver neo4j.Driver) neo4j.Session {
 	sessionConfig := neo4j.SessionConfig{AccessMode: neo4j.AccessModeWrite}
 	session, err := driver.NewSession(sessionConfig)
 
-	logError("failed creating database session", err)
+	if err != nil {
+		log.Info("failed creating database session:", err)
+	}
 
 	return session
 }
@@ -71,7 +75,9 @@ func (d Database) StoreNodes(json string) {
 			"stringToAdd": json,
 		})
 
-	logError("failed storing Nodes into database", err)
+	if err != nil {
+		log.Info("failed storing Nodes into database:", err)
+	}
 
 	log.Info("successfully added Nodes into database")
 }
@@ -96,7 +102,9 @@ func (d Database) StoreNodeEdgePoints(json string) {
 			"stringToAdd": json,
 		})
 
-	logError("failed storing NodeEdgePoints into database", err)
+	if err != nil {
+		log.Info("failed storing NodeEdgePoints into database:", err)
+	}
 
 	setNodeNodeEdgePointsRelation(session)
 
@@ -118,14 +126,13 @@ func setNodeNodeEdgePointsRelation(session neo4j.Session) {
 	_, err := session.Run(
 		query, map[string]interface{}{})
 
-	logError("failed storing NodeNodeEdgePointsRelation into database", err)
+	if err != nil {
+		log.Info("failed storing NodeNodeEdgePointsRelation into database:", err)
+	}
 
 	log.Info("successfully stored NodeNodeEdgePointsRelation into database")
 }
 
 //logError logs error with custom and error message
 func logError(message string, err error) {
-	if err != nil {
-		log.Info("%v: %v", message, err)
-	}
 }
diff --git a/log/logger.go b/log/logger.go
index ab258d8b731c5b8692ee8afe37b9c18012b712b2..060ded548d286d1a863f6bd33d9d0b9edd809fb4 100644
--- a/log/logger.go
+++ b/log/logger.go
@@ -45,27 +45,27 @@ func Output(out io.Writer) {
 }
 
 func Debug(args ...interface{}) {
-	log(DEBUG, args)
+	log(DEBUG, args...)
 }
 
 func Info(args ...interface{}) {
-	log(INFO, args)
+	log(INFO, args...)
 }
 
 func Warn(args ...interface{}) {
-	log(WARNING, args)
+	log(WARNING, args...)
 }
 
 func Error(args ...interface{}) {
-	log(ERROR, args)
+	log(ERROR, args...)
 }
 
 func Fatal(args ...interface{}) {
-	log(FATAL, args)
+	log(FATAL, args...)
 }
 
 func Panic(args ...interface{}) {
-	log(PANIC, args)
+	log(PANIC, args...)
 }
 
 func log(level Level, args ...interface{}) {
diff --git a/nucleus/controller.go b/nucleus/controller.go
index 2b4cdb19219dc74bf77a48d02f3363df09d2ead3..de00cf348ba441d1d8ef8e6c4cd4c2b99eaf8d26 100644
--- a/nucleus/controller.go
+++ b/nucleus/controller.go
@@ -48,7 +48,7 @@ func (c *Core) Init(socket, configfile string) {
 	c.AttachDatabase()
 
 	//TODO: Create client config/CLI adapter
-	c.clients["ciena-mcp"] = ciena.NewMCPClient( "141.100.70.170", "", "", &c.database)
+	c.clients["ciena-mcp"] = ciena.NewMCPClient("141.100.70.170", "", "", &c.database)
 }
 
 func (c *Core) AttachDatabase() {
diff --git a/nucleus/nucleus-core.go b/nucleus/nucleus-core.go
index 5df7e06e4bc636360acab367cb2edfd82702e4ce..cc241eacf2d8cffdb49bd2e717e31501155d2808 100644
--- a/nucleus/nucleus-core.go
+++ b/nucleus/nucleus-core.go
@@ -6,6 +6,7 @@ import (
 	"code.fbi.h-da.de/cocsn/gosdn/log"
 	"code.fbi.h-da.de/cocsn/gosdn/nucleus/interfaces"
 	"context"
+	// TODO: justify the blank import - do we need it?
 	_ "github.com/mattn/go-sqlite3"
 	"google.golang.org/grpc"
 	"net"
@@ -20,12 +21,12 @@ type server struct {
 
 // SayHello implements helloworld.GreeterServer
 func (s *server) SayHello(ctx context.Context, in *pb.HelloRequest) (*pb.HelloReply, error) {
-	log.Debug("Received: %v", in.GetName())
+	log.Debug("Received:", in.GetName())
 	return &pb.HelloReply{Message: "Hello " + in.GetName()}, nil
 }
 
 func (s *server) Shutdown(ctx context.Context, in *pb.ShutdownRequest) (*pb.ShutdownReply, error) {
-	log.Debug("Received: %v", in.GetName())
+	log.Debug("Received:", in.GetName())
 	isRunning = false
 	return &pb.ShutdownReply{Message: "Shutdown " + in.GetName()}, nil
 }
@@ -35,14 +36,14 @@ func getCLIGoing(core *Core) {
 	// Boot-up the control interface for the cli
 	cliControlListener, err := net.Listen("tcp", core.config.CliSocket)
 	if err != nil {
-		log.Fatal("failed to listen: %v", err)
+		log.Fatal("failed to listen:", err)
 	}
 
 	cliControlServer := grpc.NewServer()
 
 	pb.RegisterGreeterServer(cliControlServer, &server{core: core})
 	if err := cliControlServer.Serve(cliControlListener); err != nil {
-		log.Fatal("failed to serve: %v", err)
+		log.Fatal("failed to serve:", err)
 	}
 	log.Info("Started: GetCLIGoing")
 }