diff --git a/internal/initialize/services.go b/internal/initialize/services.go
index 69cda4d..fc41e2e 100644
--- a/internal/initialize/services.go
+++ b/internal/initialize/services.go
@@ -53,7 +53,7 @@ func NewServices(deps *ServicesDeps) *Services {
 			Logger:     deps.Logger,
 			Repository: deps.Repositories.CurrencyRepository,
 		}),
-		CartService: cart.New(&cart.Deps{
+		CartService: cart.New(cart.Deps{
 			Logger:         deps.Logger,
 			Repository:     deps.Repositories.AccountRepository,
 			HubadminClient: deps.Clients.HubadminClient,
diff --git a/internal/service/cart/cart.go b/internal/service/cart/cart.go
index 9a0956e..23535c5 100644
--- a/internal/service/cart/cart.go
+++ b/internal/service/cart/cart.go
@@ -52,11 +52,7 @@ type Service struct {
 	walletService  walletService
 }
 
-func New(deps *Deps) *Service {
-	if deps == nil {
-		log.Panicln("deps is nil on <New (cart service)>")
-	}
-
+func New(deps Deps) *Service {
 	if deps.Logger == nil {
 		log.Panicln("logger is nil on <New (cart service)>")
 	}
diff --git a/internal/service/wallet/wallet.go b/internal/service/wallet/wallet.go
index ececec8..65de388 100644
--- a/internal/service/wallet/wallet.go
+++ b/internal/service/wallet/wallet.go
@@ -22,10 +22,6 @@ type currencyClient interface {
 	Translate(context.Context, *models.TranslateCurrency) (int64, errors.Error)
 }
 
-type paymentService interface {
-	GetPaymentLink(ctx context.Context, request *models.GetPaymentLinkRequest) (string, errors.Error)
-}
-
 type Deps struct {
 	Logger         *zap.Logger
 	Repository     accountRepository
@@ -76,7 +72,7 @@ func (receiver *Service) ReplenishAccountWallet(ctx context.Context, request *mo
 		})
 		if translateErr != nil {
 			receiver.logger.Error("failed to translate cash on <ReplenishAccountWallet> of <WalletService>",
-				zap.Error(translateerr()),
+				zap.Error(translateErr.Extract()),
 			)
 
 			return nil, translateErr
@@ -95,7 +91,7 @@ func (receiver *Service) ReplenishAccountWallet(ctx context.Context, request *mo
 		})
 		if changeErr != nil {
 			receiver.logger.Error("failed to replenish wallet on <ReplenishAccountWallet> of <WalletService>",
-				zap.Error(changeerr()),
+				zap.Error(changeErr.Extract()),
 				zap.String("Currency", request.Account.Wallet.Currency),
 				zap.Int64("Money", request.Account.Wallet.Money+request.Cash),
 				zap.Int64("Cash", request.Account.Wallet.Cash+cash),
@@ -115,7 +111,7 @@ func (receiver *Service) ReplenishAccountWallet(ctx context.Context, request *mo
 	})
 	if err != nil {
 		receiver.logger.Error("failed to translate money on <ReplenishAccountWallet> of <WalletService>",
-			zap.Error(err()),
+			zap.Error(err.Extract()),
 		)
 
 		return nil, err
@@ -131,7 +127,7 @@ func (receiver *Service) ReplenishAccountWallet(ctx context.Context, request *mo
 	})
 	if err != nil {
 		receiver.logger.Error("failed to replenish wallet on <ReplenishAccountWallet> of <WalletService>",
-			zap.Error(err()),
+			zap.Error(err.Extract()),
 			zap.String("Currency", request.Account.Wallet.Currency),
 			zap.Int64("Money", request.Account.Wallet.Money+request.Cash),
 			zap.Int64("Cash", request.Account.Wallet.Cash+cash),
@@ -159,7 +155,7 @@ func (receiver *Service) WithdrawAccountWalletMoney(ctx context.Context, request
 	})
 	if err != nil {
 		receiver.logger.Error("failed to translate money on <WithdrawAccountWalletMoney> of <WalletService>",
-			zap.Error(err()),
+			zap.Error(err.Extract()),
 		)
 
 		return nil, err
@@ -174,7 +170,7 @@ func (receiver *Service) WithdrawAccountWalletMoney(ctx context.Context, request
 	})
 	if err != nil {
 		receiver.logger.Error("failed to replenish wallet on <ReplenishAccountWallet> of <WalletService>",
-			zap.Error(err()),
+			zap.Error(err.Extract()),
 			zap.String("Currency", request.Account.Wallet.Currency),
 			zap.Int64("Money", request.Account.Wallet.Money-request.Money),
 			zap.Int64("Cash", request.Account.Wallet.Cash+cash),
@@ -190,7 +186,7 @@ func (receiver *Service) ChangeCurrency(ctx context.Context, userID string, curr
 	account, err := receiver.repository.FindByUserID(ctx, userID)
 	if err != nil {
 		receiver.logger.Error("failed to find account on <ChangeCurrency> of <WalletService>",
-			zap.Error(err()),
+			zap.Error(err.Extract()),
 			zap.String("userID", userID),
 			zap.Any("currency", currency),
 		)
@@ -205,7 +201,7 @@ func (receiver *Service) ChangeCurrency(ctx context.Context, userID string, curr
 	})
 	if err != nil {
 		receiver.logger.Error("failed to translate currency on <ChangeCurrency> of <WalletService>",
-			zap.Error(err()),
+			zap.Error(err.Extract()),
 		)
 
 		return nil, err
@@ -218,7 +214,7 @@ func (receiver *Service) ChangeCurrency(ctx context.Context, userID string, curr
 	})
 	if err != nil {
 		receiver.logger.Error("failed to update wallet on <ChangeCurrency> of <WalletService>",
-			zap.Error(err()),
+			zap.Error(err.Extract()),
 		)
 
 		return nil, err