diff --git a/internal/app/components/custom_handlers/get_tool.go b/internal/app/components/customhandlers/get_tool.go
similarity index 98%
rename from internal/app/components/custom_handlers/get_tool.go
rename to internal/app/components/customhandlers/get_tool.go
index 86fe9fa..2786afa 100644
--- a/internal/app/components/custom_handlers/get_tool.go
+++ b/internal/app/components/customhandlers/get_tool.go
@@ -1,4 +1,4 @@
-package custom_handlers
+package customhandlers
 
 import (
 	"context"
diff --git a/internal/app/components/custom_handlers/server_console.go b/internal/app/components/customhandlers/server_console.go
similarity index 97%
rename from internal/app/components/custom_handlers/server_console.go
rename to internal/app/components/customhandlers/server_console.go
index d5a023d..6f05e26 100644
--- a/internal/app/components/custom_handlers/server_console.go
+++ b/internal/app/components/customhandlers/server_console.go
@@ -1,4 +1,4 @@
-package custom_handlers
+package customhandlers
 
 import (
 	"context"
diff --git a/internal/app/components/executor.go b/internal/app/components/executor.go
index 935cfab..c77ae08 100644
--- a/internal/app/components/executor.go
+++ b/internal/app/components/executor.go
@@ -19,8 +19,6 @@ var ErrEmptyCommand = errors.New("empty command")
 var ErrInvalidCommand = errors.New("invalid command")
 
 var invalidResult = -1
-var successResult = 0
-var errorResult = 1
 
 type Executor struct {
 	appendCommandAndExitCode bool
@@ -76,7 +74,7 @@ func Exec(ctx context.Context, command string, options contracts.ExecutorOptions
 	return out, exitCode, nil
 }
 
-//nolint:lll,funlen
+//nolint:funlen
 func ExecWithWriter(
 	ctx context.Context, command string, out io.Writer, options contracts.ExecutorOptions,
 ) (int, error) {
diff --git a/internal/app/di/container.go b/internal/app/di/container.go
index ca29e44..d84c955 100644
--- a/internal/app/di/container.go
+++ b/internal/app/di/container.go
@@ -7,9 +7,9 @@ package di
 import (
 	"context"
 	"github.com/gameap/daemon/internal/app/config"
+	"github.com/gameap/daemon/internal/app/contracts"
 	"github.com/gameap/daemon/internal/app/di/internal"
 	"github.com/gameap/daemon/internal/app/domain"
-	"github.com/gameap/daemon/internal/app/contracts"
 	"github.com/gameap/daemon/internal/app/services"
 	"github.com/sirupsen/logrus"
 	"sync"
@@ -60,7 +60,7 @@ func (c *Container) ProcessRunner(ctx context.Context) (*services.Runner, error)
 
 func SetApiCaller(s contracts.APIRequestMaker) Injector {
 	return func(c *Container) error {
-		c.c.Services().(*internal.ServicesContainer).SetApiCaller(s)
+		c.c.Services().(*internal.ServicesContainer).SetAPICaller(s)
 
 		return nil
 	}
diff --git a/internal/app/di/internal/container.go b/internal/app/di/internal/container.go
index 68bed41..e3bf10d 100644
--- a/internal/app/di/internal/container.go
+++ b/internal/app/di/internal/container.go
@@ -41,7 +41,8 @@ func (c *Container) Error() error {
 	return c.err
 }
 
-// SetError sets the first error into container. The error is used in the public container to return an initialization error.
+// SetError sets the first error into container.
+// The error is used in the public container to return an initialization error.
 func (c *Container) SetError(err error) {
 	if err != nil && c.err == nil {
 		c.err = err
@@ -66,11 +67,11 @@ type RepositoryContainer struct {
 	serverTaskRepository domain.ServerTaskRepository
 }
 
-func (c *Container) Cfg(ctx context.Context) *config.Config {
+func (c *Container) Cfg(_ context.Context) *config.Config {
 	return c.cfg
 }
 
-func (c *Container) Logger(ctx context.Context) *logrus.Logger {
+func (c *Container) Logger(_ context.Context) *logrus.Logger {
 	return c.logger
 }
 
@@ -106,9 +107,9 @@ func (c *ServicesContainer) Resty(ctx context.Context) *resty.Client {
 	return c.resty
 }
 
-func (c *ServicesContainer) ApiCaller(ctx context.Context) contracts.APIRequestMaker {
+func (c *ServicesContainer) APICaller(ctx context.Context) contracts.APIRequestMaker {
 	if c.apiCaller == nil && c.err == nil {
-		c.apiCaller = definitions.CreateServicesApiCaller(ctx, c)
+		c.apiCaller = definitions.CreateServicesAPICaller(ctx, c)
 	}
 	return c.apiCaller
 }
@@ -175,7 +176,7 @@ func (c *Container) SetLogger(s *logrus.Logger) {
 	c.logger = s
 }
 
-func (c *ServicesContainer) SetApiCaller(s contracts.APIRequestMaker) {
+func (c *ServicesContainer) SetAPICaller(s contracts.APIRequestMaker) {
 	c.apiCaller = s
 }
 
diff --git a/internal/app/di/internal/definitions/container.go b/internal/app/di/internal/definitions/container.go
index 4d0dbc3..6973168 100644
--- a/internal/app/di/internal/definitions/container.go
+++ b/internal/app/di/internal/definitions/container.go
@@ -13,7 +13,7 @@ func CreateProcessRunner(ctx context.Context, c Container) *services.Runner {
 		c.Cfg(ctx),
 		c.Services().Executor(ctx),
 		c.ServerCommandFactory(ctx),
-		c.Services().ApiCaller(ctx),
+		c.Services().APICaller(ctx),
 		c.Services().GdTaskManager(ctx),
 		c.Repositories().ServerRepository(ctx),
 		c.Repositories().ServerTaskRepository(ctx),
diff --git a/internal/app/di/internal/definitions/contracts.go b/internal/app/di/internal/definitions/contracts.go
index ede90d0..b8cd338 100644
--- a/internal/app/di/internal/definitions/contracts.go
+++ b/internal/app/di/internal/definitions/contracts.go
@@ -33,7 +33,7 @@ type Container interface {
 
 type ServicesContainer interface {
 	Resty(ctx context.Context) *resty.Client
-	ApiCaller(ctx context.Context) contracts.APIRequestMaker
+	APICaller(ctx context.Context) contracts.APIRequestMaker
 	Executor(ctx context.Context) contracts.Executor
 	ExtendableExecutor(ctx context.Context) contracts.Executor
 	GdTaskManager(ctx context.Context) *gdaemonscheduler.TaskManager
diff --git a/internal/app/di/internal/definitions/repositories.go b/internal/app/di/internal/definitions/repositories.go
index 107086e..45a5d46 100644
--- a/internal/app/di/internal/definitions/repositories.go
+++ b/internal/app/di/internal/definitions/repositories.go
@@ -9,15 +9,15 @@ import (
 
 func CreateRepositoriesGdTaskRepository(ctx context.Context, c Container) domain.GDTaskRepository {
 	return repositories.NewGDTaskRepository(
-		c.Services().ApiCaller(ctx),
+		c.Services().APICaller(ctx),
 		c.Repositories().ServerRepository(ctx),
 	)
 }
 
 func CreateRepositoriesServerRepository(ctx context.Context, c Container) domain.ServerRepository {
-	return repositories.NewServerRepository(ctx, c.Services().ApiCaller(ctx), c.Logger(ctx))
+	return repositories.NewServerRepository(ctx, c.Services().APICaller(ctx), c.Logger(ctx))
 }
 
 func CreateRepositoriesServerTaskRepository(ctx context.Context, c Container) domain.ServerTaskRepository {
-	return repositories.NewServerTaskRepository(c.Services().ApiCaller(ctx), c.Repositories().ServerRepository(ctx))
+	return repositories.NewServerTaskRepository(c.Services().APICaller(ctx), c.Repositories().ServerRepository(ctx))
 }
diff --git a/internal/app/di/internal/definitions/services.go b/internal/app/di/internal/definitions/services.go
index cfb6aff..88b85d5 100644
--- a/internal/app/di/internal/definitions/services.go
+++ b/internal/app/di/internal/definitions/services.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/gameap/daemon/internal/app/components"
-	"github.com/gameap/daemon/internal/app/components/custom_handlers"
+	"github.com/gameap/daemon/internal/app/components/customhandlers"
 	"github.com/gameap/daemon/internal/app/contracts"
 	gdaemonscheduler "github.com/gameap/daemon/internal/app/gdaemon_scheduler"
 	"github.com/gameap/daemon/internal/app/services"
@@ -33,7 +33,7 @@ func CreateServicesResty(ctx context.Context, c Container) *resty.Client {
 	return restyClient
 }
 
-func CreateServicesApiCaller(ctx context.Context, c Container) contracts.APIRequestMaker {
+func CreateServicesAPICaller(ctx context.Context, c Container) contracts.APIRequestMaker {
 	client, err := services.NewAPICaller(
 		ctx,
 		c.Cfg(ctx),
@@ -55,7 +55,7 @@ func CreateServicesExecutor(_ context.Context, _ Container) contracts.Executor {
 func CreateServiceExtendableExecutor(ctx context.Context, c Container) contracts.Executor {
 	executor := components.NewDefaultExtendableExecutor(c.Services().Executor(ctx))
 
-	executor.RegisterHandler("get-tool", custom_handlers.NewGetTool(c.Cfg(ctx)).Handle)
+	executor.RegisterHandler("get-tool", customhandlers.NewGetTool(c.Cfg(ctx)).Handle)
 
 	return executor
 }