diff --git a/cmd/gitness/wire.go b/cmd/gitness/wire.go
index f2e3a54b3..07051bab0 100644
--- a/cmd/gitness/wire.go
+++ b/cmd/gitness/wire.go
@@ -9,7 +9,6 @@ package main
 
 import (
 	"context"
-	"github.com/harness/gitness/internal/api/controller/system"
 
 	cliserver "github.com/harness/gitness/cli/server"
 	"github.com/harness/gitness/encrypt"
@@ -30,6 +29,7 @@ import (
 	"github.com/harness/gitness/internal/api/controller/service"
 	"github.com/harness/gitness/internal/api/controller/serviceaccount"
 	"github.com/harness/gitness/internal/api/controller/space"
+	"github.com/harness/gitness/internal/api/controller/system"
 	"github.com/harness/gitness/internal/api/controller/template"
 	"github.com/harness/gitness/internal/api/controller/trigger"
 	"github.com/harness/gitness/internal/api/controller/user"
diff --git a/cmd/gitness/wire_gen.go b/cmd/gitness/wire_gen.go
index 1c20fdcc6..3829a1042 100644
--- a/cmd/gitness/wire_gen.go
+++ b/cmd/gitness/wire_gen.go
@@ -8,6 +8,7 @@ package main
 
 import (
 	"context"
+
 	"github.com/harness/gitness/cli/server"
 	"github.com/harness/gitness/encrypt"
 	"github.com/harness/gitness/events"
diff --git a/internal/api/controller/space/list_connectors.go b/internal/api/controller/space/list_connectors.go
index a888c4e83..74b34e09f 100644
--- a/internal/api/controller/space/list_connectors.go
+++ b/internal/api/controller/space/list_connectors.go
@@ -13,7 +13,7 @@ import (
 	"github.com/harness/gitness/types/enum"
 )
 
-// ListSecrets lists the  connectors in a space.
+// ListConnectors lists the  connectors in a space.
 func (c *Controller) ListConnectors(
 	ctx context.Context,
 	session *auth.Session,
@@ -30,22 +30,15 @@ func (c *Controller) ListConnectors(
 		return nil, 0, fmt.Errorf("could not authorize: %w", err)
 	}
 
-	var count int64
-	var connectors []*types.Connector
-
-	count, err = c.connectorStore.Count(ctx, space.ID, filter)
+	count, err := c.connectorStore.Count(ctx, space.ID, filter)
 	if err != nil {
 		return nil, 0, fmt.Errorf("failed to count child executions: %w", err)
 	}
 
-	connectors, err = c.connectorStore.List(ctx, space.ID, filter)
+	connectors, err := c.connectorStore.List(ctx, space.ID, filter)
 	if err != nil {
 		return nil, 0, fmt.Errorf("failed to list child executions: %w", err)
 	}
 
-	if err != nil {
-		return connectors, count, fmt.Errorf("failed to list  connectors: %w", err)
-	}
-
 	return connectors, count, nil
 }
diff --git a/internal/api/controller/space/list_templates.go b/internal/api/controller/space/list_templates.go
index f7c4d28f7..8c5344ba8 100644
--- a/internal/api/controller/space/list_templates.go
+++ b/internal/api/controller/space/list_templates.go
@@ -30,15 +30,12 @@ func (c *Controller) ListTemplates(
 		return nil, 0, fmt.Errorf("could not authorize: %w", err)
 	}
 
-	var count int64
-	var templates []*types.Template
-
-	count, err = c.templateStore.Count(ctx, space.ID, filter)
+	count, err := c.templateStore.Count(ctx, space.ID, filter)
 	if err != nil {
 		return nil, 0, fmt.Errorf("failed to count templates in the space: %w", err)
 	}
 
-	templates, err = c.templateStore.List(ctx, space.ID, filter)
+	templates, err := c.templateStore.List(ctx, space.ID, filter)
 	if err != nil {
 		return nil, 0, fmt.Errorf("failed to list templates: %w", err)
 	}
diff --git a/internal/api/controller/trigger/create.go b/internal/api/controller/trigger/create.go
index a7067fa8e..6d058a6d8 100644
--- a/internal/api/controller/trigger/create.go
+++ b/internal/api/controller/trigger/create.go
@@ -43,11 +43,6 @@ func (c *Controller) Create(
 		return nil, fmt.Errorf("failed to authorize: %w", err)
 	}
 
-	pipeline, err = c.pipelineStore.IncrementSeqNum(ctx, pipeline)
-	if err != nil {
-		return nil, fmt.Errorf("failed to increment sequence number: %w", err)
-	}
-
 	now := time.Now().UnixMilli()
 	trigger := &types.Trigger{
 		Description: in.Description,
diff --git a/internal/api/controller/webhook/controller.go b/internal/api/controller/webhook/controller.go
index 2c392b559..338ee4fc7 100644
--- a/internal/api/controller/webhook/controller.go
+++ b/internal/api/controller/webhook/controller.go
@@ -7,6 +7,7 @@ package webhook
 import (
 	"context"
 	"fmt"
+
 	apiauth "github.com/harness/gitness/internal/api/auth"
 	"github.com/harness/gitness/internal/api/usererror"
 	"github.com/harness/gitness/internal/auth"
diff --git a/internal/api/handler/logs/tail.go b/internal/api/handler/logs/tail.go
index e21d94878..57de5d0a2 100644
--- a/internal/api/handler/logs/tail.go
+++ b/internal/api/handler/logs/tail.go
@@ -15,6 +15,7 @@ import (
 	"github.com/harness/gitness/internal/api/render"
 	"github.com/harness/gitness/internal/api/request"
 	"github.com/harness/gitness/internal/paths"
+
 	"github.com/rs/zerolog/log"
 )
 
diff --git a/internal/store/database/stage.go b/internal/store/database/stage.go
index 4e2bb8183..ee2223a02 100644
--- a/internal/store/database/stage.go
+++ b/internal/store/database/stage.go
@@ -7,13 +7,13 @@ package database
 import (
 	"context"
 
-	"github.com/jmoiron/sqlx"
-	sqlxtypes "github.com/jmoiron/sqlx/types"
-
 	"github.com/harness/gitness/internal/store"
 	"github.com/harness/gitness/store/database"
 	"github.com/harness/gitness/store/database/dbtx"
 	"github.com/harness/gitness/types"
+
+	"github.com/jmoiron/sqlx"
+	sqlxtypes "github.com/jmoiron/sqlx/types"
 )
 
 var _ store.StageStore = (*stageStore)(nil)
diff --git a/internal/store/database/stage_map.go b/internal/store/database/stage_map.go
index 46a16f4e7..8b68903fb 100644
--- a/internal/store/database/stage_map.go
+++ b/internal/store/database/stage_map.go
@@ -8,10 +8,10 @@ import (
 	"database/sql"
 	"encoding/json"
 
+	"github.com/harness/gitness/types"
+
 	sqlxtypes "github.com/jmoiron/sqlx/types"
 	"github.com/pkg/errors"
-
-	"github.com/harness/gitness/types"
 )
 
 func mapInternalToStage(in *stage) (*types.Stage, error) {
diff --git a/internal/store/database/step.go b/internal/store/database/step.go
index 8e3ac9daf..adfdf1fb8 100644
--- a/internal/store/database/step.go
+++ b/internal/store/database/step.go
@@ -7,13 +7,13 @@ package database
 import (
 	"context"
 
-	"github.com/jmoiron/sqlx"
-	sqlxtypes "github.com/jmoiron/sqlx/types"
-
 	"github.com/harness/gitness/internal/store"
 	"github.com/harness/gitness/store/database"
 	"github.com/harness/gitness/store/database/dbtx"
 	"github.com/harness/gitness/types"
+
+	"github.com/jmoiron/sqlx"
+	sqlxtypes "github.com/jmoiron/sqlx/types"
 )
 
 var _ store.StepStore = (*stepStore)(nil)
diff --git a/mocks/mock_client.go b/mocks/mock_client.go
index b16a6490e..3cb746055 100644
--- a/mocks/mock_client.go
+++ b/mocks/mock_client.go
@@ -8,9 +8,10 @@ import (
 	context "context"
 	reflect "reflect"
 
-	gomock "github.com/golang/mock/gomock"
 	user "github.com/harness/gitness/internal/api/controller/user"
 	types "github.com/harness/gitness/types"
+
+	gomock "github.com/golang/mock/gomock"
 )
 
 // MockClient is a mock of Client interface.
diff --git a/mocks/mock_store.go b/mocks/mock_store.go
index 0af0bbc34..9310f3729 100644
--- a/mocks/mock_store.go
+++ b/mocks/mock_store.go
@@ -8,9 +8,10 @@ import (
 	context "context"
 	reflect "reflect"
 
-	gomock "github.com/golang/mock/gomock"
 	types "github.com/harness/gitness/types"
 	enum "github.com/harness/gitness/types/enum"
+
+	gomock "github.com/golang/mock/gomock"
 )
 
 // MockPrincipalStore is a mock of PrincipalStore interface.