diff --git a/pkg/cmd/server/service/broker/rabbitmq/rabbitmq.go b/pkg/cmd/server/service/broker/rabbitmq/rabbitmq.go
index 42fc3f26..6ffbcc57 100644
--- a/pkg/cmd/server/service/broker/rabbitmq/rabbitmq.go
+++ b/pkg/cmd/server/service/broker/rabbitmq/rabbitmq.go
@@ -12,13 +12,13 @@ func New(uri string, logger models.Logger, exchange *routers.Router, queues []*q
 	rabbitMQ, err := communications.NewRabbitMQ(uri, logger)
 
 	if err != nil {
-		return nil, errors.BubbleUp(err, "Init")
+		return nil, errors.BubbleUp(err, "New")
 	}
 
 	err = rabbitMQ.AddRouter(exchange)
 
 	if err != nil {
-		return nil, errors.BubbleUp(err, "Init")
+		return nil, errors.BubbleUp(err, "New")
 	}
 
 	for _, queue := range queues {
@@ -26,13 +26,13 @@ func New(uri string, logger models.Logger, exchange *routers.Router, queues []*q
 		err = rabbitMQ.AddQueue(queue)
 
 		if err != nil {
-			return nil, errors.BubbleUp(err, "Init")
+			return nil, errors.BubbleUp(err, "New")
 		}
 
 		err = rabbitMQ.AddQueueMessageBind(queue, queue.BindingKeys)
 
 		if err != nil {
-			return nil, errors.BubbleUp(err, "Init")
+			return nil, errors.BubbleUp(err, "New")
 		}
 	}
 
@@ -40,7 +40,7 @@ func New(uri string, logger models.Logger, exchange *routers.Router, queues []*q
 		err = rabbitMQ.AddQueueConsumer(consumer)
 
 		if err != nil {
-			return nil, errors.BubbleUp(err, "Init")
+			return nil, errors.BubbleUp(err, "New")
 		}
 	}
 
diff --git a/pkg/cmd/server/service/database/mongodb/mongodb.go b/pkg/cmd/server/service/database/mongodb/mongodb.go
index f3de9999..303570b2 100644
--- a/pkg/cmd/server/service/database/mongodb/mongodb.go
+++ b/pkg/cmd/server/service/database/mongodb/mongodb.go
@@ -11,7 +11,7 @@ func New(uri, name string) (*persistences.MongoDB, error) {
 	mongoDB, err := persistences.NewMongoDatabase(uri, name)
 
 	if err != nil {
-		return nil, errors.BubbleUp(err, "Init")
+		return nil, errors.BubbleUp(err, "New")
 	}
 
 	return mongoDB, nil
diff --git a/pkg/cmd/server/service/notify/terminal.go b/pkg/cmd/server/service/notify/terminal.go
index 1521c0fd..8c22d4e5 100644
--- a/pkg/cmd/server/service/notify/terminal.go
+++ b/pkg/cmd/server/service/notify/terminal.go
@@ -6,9 +6,9 @@ import (
 	"github.com/bastean/codexgo/pkg/context/shared/domain/models"
 )
 
-func NewTerminalAccountConfirmation(serverURL string, logger models.Logger) model.Transport {
+func NewTerminalAccountConfirmation(logger models.Logger, serverURL string) model.Transport {
 	return &terminal.AccountConfirmation{
-		ServerURL: serverURL,
 		Logger:    logger,
+		ServerURL: serverURL,
 	}
 }
diff --git a/pkg/cmd/server/service/service.go b/pkg/cmd/server/service/service.go
index f909e8ea..7b75125c 100644
--- a/pkg/cmd/server/service/service.go
+++ b/pkg/cmd/server/service/service.go
@@ -40,8 +40,8 @@ func Start() error {
 		notify.Init(notify.NewMailAccountConfirmation(SMTP))
 	} else {
 		notify.Init(notify.NewTerminalAccountConfirmation(
-			env.ServerURL,
 			logger.Logger,
+			env.ServerURL,
 		))
 	}
 
@@ -74,7 +74,7 @@ func Start() error {
 
 	logger.Info("starting user")
 
-	userMongoCollection, err := user.InitMongoCollection(
+	userMongoCollection, err := user.NewMongoCollection(
 		MongoDB,
 		"users",
 		user.Bcrypt,
@@ -84,16 +84,12 @@ func Start() error {
 		return errors.BubbleUp(err, "Start")
 	}
 
-	err = user.Init(
+	user.Init(
 		userMongoCollection,
 		RabbitMQ,
 		user.Bcrypt,
 	)
 
-	if err != nil {
-		return errors.BubbleUp(err, "Start")
-	}
-
 	return nil
 }
 
diff --git a/pkg/cmd/server/service/user/repository.go b/pkg/cmd/server/service/user/repository.go
index 526e62d0..e25e756c 100644
--- a/pkg/cmd/server/service/user/repository.go
+++ b/pkg/cmd/server/service/user/repository.go
@@ -7,11 +7,11 @@ import (
 	"github.com/bastean/codexgo/pkg/context/user/infrastructure/persistence"
 )
 
-func InitMongoCollection(database *persistences.MongoDB, name string, hashing model.Hashing) (model.Repository, error) {
+func NewMongoCollection(database *persistences.MongoDB, name string, hashing model.Hashing) (model.Repository, error) {
 	collection, err := persistence.NewMongoCollection(database, name, hashing)
 
 	if err != nil {
-		return nil, errors.BubbleUp(err, "Init")
+		return nil, errors.BubbleUp(err, "NewMongoCollection")
 	}
 
 	return collection, nil
diff --git a/pkg/cmd/server/service/user/user.go b/pkg/cmd/server/service/user/user.go
index bc299627..2d0b869e 100644
--- a/pkg/cmd/server/service/user/user.go
+++ b/pkg/cmd/server/service/user/user.go
@@ -24,7 +24,7 @@ var Verify *verify.CommandHandler
 
 var Login *login.QueryHandler
 
-func Init(repository model.Repository, broker models.Broker, hashing model.Hashing) error {
+func Init(repository model.Repository, broker models.Broker, hashing model.Hashing) {
 	Create = NewCreate(repository, broker)
 
 	Read = NewRead(repository)
@@ -36,6 +36,4 @@ func Init(repository model.Repository, broker models.Broker, hashing model.Hashi
 	Verify = NewVerify(repository)
 
 	Login = NewLogin(repository, hashing)
-
-	return nil
 }
diff --git a/pkg/context/shared/infrastructure/communications/rabbitmq.go b/pkg/context/shared/infrastructure/communications/rabbitmq.go
index 45c1480c..e6897ab8 100644
--- a/pkg/context/shared/infrastructure/communications/rabbitmq.go
+++ b/pkg/context/shared/infrastructure/communications/rabbitmq.go
@@ -40,7 +40,7 @@ func (rmq *RabbitMQ) AddRouter(router *routers.Router) error {
 	if err != nil {
 		return errors.NewInternal(&errors.Bubble{
 			Where: "AddRouter",
-			What:  "failure to declare an exchange",
+			What:  "failure to declare a router",
 			Why: errors.Meta{
 				"Router": router.Name,
 			},