diff --git a/src/Makefile b/src/Makefile
index 73474de0c..c832d5d79 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -15,6 +15,10 @@ lint: check-lint-version
 	golangci-lint run
 	staticcheck ./...
 
+fmt:
+	gofumpt -w .
+	gci write --skip-generated -s 'standard,default,prefix(github.com/alcionai/corso)' .
+
 check-lint-version: check-lint
 	@if [ "$(LINT_VERSION)" != "$(WANTED_LINT_VERSION)" ]; then \
 		echo >&2 $(BAD_LINT_MSG); \
diff --git a/src/internal/connector/graph/betasdk/models/horizontal_section_layout_type.go b/src/internal/connector/graph/betasdk/models/horizontal_section_layout_type.go
index 80e208ffe..dd24cc509 100644
--- a/src/internal/connector/graph/betasdk/models/horizontal_section_layout_type.go
+++ b/src/internal/connector/graph/betasdk/models/horizontal_section_layout_type.go
@@ -21,6 +21,7 @@ const (
 func (i HorizontalSectionLayoutType) String() string {
 	return []string{"none", "oneColumn", "twoColumns", "threeColumns", "oneThirdLeftColumn", "oneThirdRightColumn", "fullWidth", "unknownFutureValue"}[i]
 }
+
 func ParseHorizontalSectionLayoutType(v string) (interface{}, error) {
 	result := NONE_HORIZONTALSECTIONLAYOUTTYPE
 	switch v {
@@ -45,6 +46,7 @@ func ParseHorizontalSectionLayoutType(v string) (interface{}, error) {
 	}
 	return &result, nil
 }
+
 func SerializeHorizontalSectionLayoutType(values []HorizontalSectionLayoutType) []string {
 	result := make([]string, len(values))
 	for i, v := range values {
diff --git a/src/internal/connector/graph/betasdk/models/page_layout_type.go b/src/internal/connector/graph/betasdk/models/page_layout_type.go
index fce795760..896ac6a44 100644
--- a/src/internal/connector/graph/betasdk/models/page_layout_type.go
+++ b/src/internal/connector/graph/betasdk/models/page_layout_type.go
@@ -17,6 +17,7 @@ const (
 func (i PageLayoutType) String() string {
 	return []string{"microsoftReserved", "article", "home", "unknownFutureValue"}[i]
 }
+
 func ParsePageLayoutType(v string) (interface{}, error) {
 	result := MICROSOFTRESERVED_PAGELAYOUTTYPE
 	switch v {
@@ -33,6 +34,7 @@ func ParsePageLayoutType(v string) (interface{}, error) {
 	}
 	return &result, nil
 }
+
 func SerializePageLayoutType(values []PageLayoutType) []string {
 	result := make([]string, len(values))
 	for i, v := range values {
diff --git a/src/internal/connector/graph/betasdk/models/page_promotion_type.go b/src/internal/connector/graph/betasdk/models/page_promotion_type.go
index e78ce63f0..f072e141d 100644
--- a/src/internal/connector/graph/betasdk/models/page_promotion_type.go
+++ b/src/internal/connector/graph/betasdk/models/page_promotion_type.go
@@ -17,6 +17,7 @@ const (
 func (i PagePromotionType) String() string {
 	return []string{"microsoftReserved", "page", "newsPost", "unknownFutureValue"}[i]
 }
+
 func ParsePagePromotionType(v string) (interface{}, error) {
 	result := MICROSOFTRESERVED_PAGEPROMOTIONTYPE
 	switch v {
@@ -33,6 +34,7 @@ func ParsePagePromotionType(v string) (interface{}, error) {
 	}
 	return &result, nil
 }
+
 func SerializePagePromotionType(values []PagePromotionType) []string {
 	result := make([]string, len(values))
 	for i, v := range values {
diff --git a/src/internal/connector/graph/betasdk/models/section_emphasis_type.go b/src/internal/connector/graph/betasdk/models/section_emphasis_type.go
index 301ae839f..184ab8521 100644
--- a/src/internal/connector/graph/betasdk/models/section_emphasis_type.go
+++ b/src/internal/connector/graph/betasdk/models/section_emphasis_type.go
@@ -18,6 +18,7 @@ const (
 func (i SectionEmphasisType) String() string {
 	return []string{"none", "neutral", "soft", "strong", "unknownFutureValue"}[i]
 }
+
 func ParseSectionEmphasisType(v string) (interface{}, error) {
 	result := NONE_SECTIONEMPHASISTYPE
 	switch v {
@@ -36,6 +37,7 @@ func ParseSectionEmphasisType(v string) (interface{}, error) {
 	}
 	return &result, nil
 }
+
 func SerializeSectionEmphasisType(values []SectionEmphasisType) []string {
 	result := make([]string, len(values))
 	for i, v := range values {
diff --git a/src/internal/connector/graph/betasdk/models/site_access_type.go b/src/internal/connector/graph/betasdk/models/site_access_type.go
index 2d4cedffe..ff07d2dfa 100644
--- a/src/internal/connector/graph/betasdk/models/site_access_type.go
+++ b/src/internal/connector/graph/betasdk/models/site_access_type.go
@@ -16,6 +16,7 @@ const (
 func (i SiteAccessType) String() string {
 	return []string{"block", "full", "limited"}[i]
 }
+
 func ParseSiteAccessType(v string) (interface{}, error) {
 	result := BLOCK_SITEACCESSTYPE
 	switch v {
@@ -30,6 +31,7 @@ func ParseSiteAccessType(v string) (interface{}, error) {
 	}
 	return &result, nil
 }
+
 func SerializeSiteAccessType(values []SiteAccessType) []string {
 	result := make([]string, len(values))
 	for i, v := range values {
diff --git a/src/internal/connector/graph/betasdk/models/site_security_level.go b/src/internal/connector/graph/betasdk/models/site_security_level.go
index 0c75c164e..ac12a6696 100644
--- a/src/internal/connector/graph/betasdk/models/site_security_level.go
+++ b/src/internal/connector/graph/betasdk/models/site_security_level.go
@@ -25,6 +25,7 @@ const (
 func (i SiteSecurityLevel) String() string {
 	return []string{"userDefined", "low", "mediumLow", "medium", "mediumHigh", "high"}[i]
 }
+
 func ParseSiteSecurityLevel(v string) (interface{}, error) {
 	result := USERDEFINED_SITESECURITYLEVEL
 	switch v {
@@ -45,6 +46,7 @@ func ParseSiteSecurityLevel(v string) (interface{}, error) {
 	}
 	return &result, nil
 }
+
 func SerializeSiteSecurityLevel(values []SiteSecurityLevel) []string {
 	result := make([]string, len(values))
 	for i, v := range values {
diff --git a/src/internal/connector/graph/betasdk/models/title_area_layout_type.go b/src/internal/connector/graph/betasdk/models/title_area_layout_type.go
index 3621288a4..f766655f0 100644
--- a/src/internal/connector/graph/betasdk/models/title_area_layout_type.go
+++ b/src/internal/connector/graph/betasdk/models/title_area_layout_type.go
@@ -18,6 +18,7 @@ const (
 func (i TitleAreaLayoutType) String() string {
 	return []string{"imageAndTitle", "plain", "colorBlock", "overlap", "unknownFutureValue"}[i]
 }
+
 func ParseTitleAreaLayoutType(v string) (interface{}, error) {
 	result := IMAGEANDTITLE_TITLEAREALAYOUTTYPE
 	switch v {
@@ -36,6 +37,7 @@ func ParseTitleAreaLayoutType(v string) (interface{}, error) {
 	}
 	return &result, nil
 }
+
 func SerializeTitleAreaLayoutType(values []TitleAreaLayoutType) []string {
 	result := make([]string, len(values))
 	for i, v := range values {
diff --git a/src/internal/connector/graph/betasdk/models/title_area_text_alignment_type.go b/src/internal/connector/graph/betasdk/models/title_area_text_alignment_type.go
index a34f41dbe..a56368f58 100644
--- a/src/internal/connector/graph/betasdk/models/title_area_text_alignment_type.go
+++ b/src/internal/connector/graph/betasdk/models/title_area_text_alignment_type.go
@@ -16,6 +16,7 @@ const (
 func (i TitleAreaTextAlignmentType) String() string {
 	return []string{"left", "center", "unknownFutureValue"}[i]
 }
+
 func ParseTitleAreaTextAlignmentType(v string) (interface{}, error) {
 	result := LEFT_TITLEAREATEXTALIGNMENTTYPE
 	switch v {
@@ -30,6 +31,7 @@ func ParseTitleAreaTextAlignmentType(v string) (interface{}, error) {
 	}
 	return &result, nil
 }
+
 func SerializeTitleAreaTextAlignmentType(values []TitleAreaTextAlignmentType) []string {
 	result := make([]string, len(values))
 	for i, v := range values {
diff --git a/src/internal/connector/sharepoint/api/helper_test.go b/src/internal/connector/sharepoint/api/helper_test.go
index 1d50263ee..23298e240 100644
--- a/src/internal/connector/sharepoint/api/helper_test.go
+++ b/src/internal/connector/sharepoint/api/helper_test.go
@@ -3,9 +3,9 @@ package api_test
 import (
 	"testing"
 
-	discover "github.com/alcionai/corso/src/internal/connector/discovery/api"
 	"github.com/stretchr/testify/require"
 
+	discover "github.com/alcionai/corso/src/internal/connector/discovery/api"
 	"github.com/alcionai/corso/src/internal/connector/graph"
 	"github.com/alcionai/corso/src/pkg/account"
 )
diff --git a/src/pkg/logger/example_logger_test.go b/src/pkg/logger/example_logger_test.go
index d04cc02ff..685dae2b4 100644
--- a/src/pkg/logger/example_logger_test.go
+++ b/src/pkg/logger/example_logger_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/alcionai/clues"
+
 	"github.com/alcionai/corso/src/pkg/logger"
 )
 
diff --git a/src/pkg/selectors/scopes.go b/src/pkg/selectors/scopes.go
index 9ea595897..5fc05e789 100644
--- a/src/pkg/selectors/scopes.go
+++ b/src/pkg/selectors/scopes.go
@@ -3,9 +3,9 @@ package selectors
 import (
 	"context"
 
+	"github.com/alcionai/clues"
 	"golang.org/x/exp/maps"
 
-	"github.com/alcionai/clues"
 	D "github.com/alcionai/corso/src/internal/diagnostics"
 	"github.com/alcionai/corso/src/pkg/backup/details"
 	"github.com/alcionai/corso/src/pkg/fault"