diff --git a/build/generate/generate.go b/build/generate/generate.go
index 6334655a2..b7452d678 100644
--- a/build/generate/generate.go
+++ b/build/generate/generate.go
@@ -1,8 +1,6 @@
 package main
 
-import (
-	"log"
-)
+import "log"
 
 func main() {
 	if err := generateFeatureMatrix(); err != nil {
diff --git a/commands/commands.go b/commands/commands.go
index 87c7cf126..bdc9dea06 100644
--- a/commands/commands.go
+++ b/commands/commands.go
@@ -7,11 +7,10 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/urfave/cli/v2"
-
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/js"
 	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
+	"github.com/urfave/cli/v2"
 )
 
 // categories of commands
diff --git a/commands/createDomains.go b/commands/createDomains.go
index 56c2e7c45..eab303bb9 100644
--- a/commands/createDomains.go
+++ b/commands/createDomains.go
@@ -2,10 +2,10 @@ package commands
 
 import (
 	"fmt"
-	"github.com/urfave/cli/v2"
 
 	"github.com/StackExchange/dnscontrol/v3/pkg/credsfile"
 	"github.com/StackExchange/dnscontrol/v3/providers"
+	"github.com/urfave/cli/v2"
 )
 
 var _ = cmd(catUtils, func() *cli.Command {
diff --git a/commands/gz_test.go b/commands/gz_test.go
index 11d00654a..c8336b420 100644
--- a/commands/gz_test.go
+++ b/commands/gz_test.go
@@ -6,9 +6,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/andreyvit/diff"
-
 	_ "github.com/StackExchange/dnscontrol/v3/providers/_all"
+	"github.com/andreyvit/diff"
 )
 
 func TestFormatTypes(t *testing.T) {
diff --git a/commands/previewPush.go b/commands/previewPush.go
index 167571bc6..1de4a568d 100644
--- a/commands/previewPush.go
+++ b/commands/previewPush.go
@@ -6,8 +6,6 @@ import (
 	"os"
 	"strings"
 
-	"github.com/urfave/cli/v2"
-
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/credsfile"
 	"github.com/StackExchange/dnscontrol/v3/pkg/nameservers"
@@ -15,7 +13,7 @@ import (
 	"github.com/StackExchange/dnscontrol/v3/pkg/notifications"
 	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"github.com/StackExchange/dnscontrol/v3/providers"
-
+	"github.com/urfave/cli/v2"
 	"golang.org/x/exp/slices"
 )
 
diff --git a/commands/printIR.go b/commands/printIR.go
index 76aa4ca1b..fdad672a8 100644
--- a/commands/printIR.go
+++ b/commands/printIR.go
@@ -7,11 +7,10 @@ import (
 	"os"
 	"strings"
 
-	"github.com/urfave/cli/v2"
-
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/js"
 	"github.com/StackExchange/dnscontrol/v3/pkg/normalize"
+	"github.com/urfave/cli/v2"
 )
 
 var _ = cmd(catDebug, func() *cli.Command {
diff --git a/integrationTest/integration_test.go b/integrationTest/integration_test.go
index 6b0d60576..2de26c9cf 100644
--- a/integrationTest/integration_test.go
+++ b/integrationTest/integration_test.go
@@ -203,7 +203,7 @@ func makeChanges(t *testing.T, prv providers.DNSServiceProvider, dc *models.Doma
 		dom2, _ := dom.Copy()
 
 		if err := providers.AuditRecords(*providerToRun, dom.Records); err != nil {
-			t.Skip(fmt.Sprintf("***SKIPPED(PROVIDER DOES NOT SUPPORT '%s' ::%q)", err, desc))
+			t.Skipf("***SKIPPED(PROVIDER DOES NOT SUPPORT '%s' ::%q)", err, desc)
 			return
 		}
 
diff --git a/models/dns_test.go b/models/dns_test.go
index 800814a77..4f269f9c1 100644
--- a/models/dns_test.go
+++ b/models/dns_test.go
@@ -1,8 +1,6 @@
 package models
 
-import (
-	"testing"
-)
+import "testing"
 
 func TestRR(t *testing.T) {
 	experiment := RecordConfig{
diff --git a/models/quotes_test.go b/models/quotes_test.go
index ae6c0ba2b..86cc80f73 100644
--- a/models/quotes_test.go
+++ b/models/quotes_test.go
@@ -1,8 +1,6 @@
 package models
 
-import (
-	"testing"
-)
+import "testing"
 
 func TestIsQuoted(t *testing.T) {
 	tests := []struct {
diff --git a/models/tonameservers_test.go b/models/tonameservers_test.go
index 91ae4c436..eda0bef5c 100644
--- a/models/tonameservers_test.go
+++ b/models/tonameservers_test.go
@@ -1,8 +1,6 @@
 package models
 
-import (
-	"testing"
-)
+import "testing"
 
 func TestToNameservers(t *testing.T) {
 	nss, e := ToNameservers([]string{"example.com", "example2.tld"})
diff --git a/pkg/acme/vaultStorage.go b/pkg/acme/vaultStorage.go
index 9666fedda..3a86c57be 100644
--- a/pkg/acme/vaultStorage.go
+++ b/pkg/acme/vaultStorage.go
@@ -9,7 +9,6 @@ import (
 	"strings"
 
 	"github.com/go-acme/lego/certificate"
-
 	"github.com/hashicorp/vault/api"
 )
 
diff --git a/pkg/diff/diff.go b/pkg/diff/diff.go
index c6d515cbe..f2598d891 100644
--- a/pkg/diff/diff.go
+++ b/pkg/diff/diff.go
@@ -4,10 +4,9 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/gobwas/glob"
-
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
+	"github.com/gobwas/glob"
 )
 
 // Correlation stores a difference between two domains.
diff --git a/pkg/js/js.go b/pkg/js/js.go
index 4246540b1..b0da224b3 100644
--- a/pkg/js/js.go
+++ b/pkg/js/js.go
@@ -9,17 +9,15 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/StackExchange/dnscontrol/v3/models"
+	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
+	"github.com/StackExchange/dnscontrol/v3/pkg/transform"
 	"github.com/robertkrimen/otto"              // load underscore js into vm by default
 	_ "github.com/robertkrimen/otto/underscore" // required by otto
-
 	"github.com/xddxdd/ottoext/fetch"
 	"github.com/xddxdd/ottoext/loop"
 	"github.com/xddxdd/ottoext/promise"
 	"github.com/xddxdd/ottoext/timers"
-
-	"github.com/StackExchange/dnscontrol/v3/models"
-	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
-	"github.com/StackExchange/dnscontrol/v3/pkg/transform"
 )
 
 //go:embed helpers.js
diff --git a/pkg/js/js_test.go b/pkg/js/js_test.go
index 282560486..23e09416f 100644
--- a/pkg/js/js_test.go
+++ b/pkg/js/js_test.go
@@ -9,12 +9,11 @@ import (
 	"testing"
 	"unicode"
 
-	testifyrequire "github.com/stretchr/testify/require"
-
 	"github.com/StackExchange/dnscontrol/v3/pkg/normalize"
 	"github.com/StackExchange/dnscontrol/v3/pkg/prettyzone"
 	"github.com/StackExchange/dnscontrol/v3/providers"
 	_ "github.com/StackExchange/dnscontrol/v3/providers/_all"
+	testifyrequire "github.com/stretchr/testify/require"
 )
 
 const (
diff --git a/pkg/rejectif/audit.go b/pkg/rejectif/audit.go
index 7cf494db0..659db509e 100644
--- a/pkg/rejectif/audit.go
+++ b/pkg/rejectif/audit.go
@@ -1,8 +1,6 @@
 package rejectif
 
-import (
-	"github.com/StackExchange/dnscontrol/v3/models"
-)
+import "github.com/StackExchange/dnscontrol/v3/models"
 
 // Auditor stores a list of checks to be executed during Audit().
 type Auditor struct {
diff --git a/pkg/transform/arpa_test.go b/pkg/transform/arpa_test.go
index 7518e87cd..67646e037 100644
--- a/pkg/transform/arpa_test.go
+++ b/pkg/transform/arpa_test.go
@@ -1,7 +1,9 @@
 package transform
 
-import "testing"
-import "fmt"
+import (
+	"fmt"
+	"testing"
+)
 
 func TestReverse(t *testing.T) {
 	var tests = []struct {
diff --git a/pkg/txtutil/txtutil.go b/pkg/txtutil/txtutil.go
index 5aed57248..432e198ce 100644
--- a/pkg/txtutil/txtutil.go
+++ b/pkg/txtutil/txtutil.go
@@ -1,8 +1,6 @@
 package txtutil
 
-import (
-	"github.com/StackExchange/dnscontrol/v3/models"
-)
+import "github.com/StackExchange/dnscontrol/v3/models"
 
 // SplitSingleLongTxt finds TXT records with a single long string and splits it
 // into 255-octet chunks. This is used by providers that, when a user specifies
diff --git a/providers/akamaiedgedns/akamaiEdgeDnsService.go b/providers/akamaiedgedns/akamaiEdgeDnsService.go
index a490abe55..16093ec15 100644
--- a/providers/akamaiedgedns/akamaiEdgeDnsService.go
+++ b/providers/akamaiedgedns/akamaiEdgeDnsService.go
@@ -10,6 +10,7 @@ https://github.com/akamai/AkamaiOPEN-edgegrid-golang
 
 import (
 	"fmt"
+
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	dnsv2 "github.com/akamai/AkamaiOPEN-edgegrid-golang/configdns-v2"
diff --git a/providers/autodns/api.go b/providers/autodns/api.go
index 3b2da2815..a7467c2e8 100644
--- a/providers/autodns/api.go
+++ b/providers/autodns/api.go
@@ -25,7 +25,7 @@ type ZoneListRequest struct {
 	Filter []*ZoneListFilter `json:"filters"`
 }
 
-func (api *autoDnsProvider) request(method string, requestPath string, data interface{}) ([]byte, error) {
+func (api *autoDNSProvider) request(method string, requestPath string, data interface{}) ([]byte, error) {
 	client := &http.Client{}
 
 	requestURL := api.baseURL
@@ -57,7 +57,7 @@ func (api *autoDnsProvider) request(method string, requestPath string, data inte
 	return responseText, nil
 }
 
-func (api *autoDnsProvider) findZoneSystemNameServer(domain string) (*models.Nameserver, error) {
+func (api *autoDNSProvider) findZoneSystemNameServer(domain string) (*models.Nameserver, error) {
 	request := &ZoneListRequest{}
 
 	request.Filter = append(request.Filter, &ZoneListFilter{
@@ -82,7 +82,7 @@ func (api *autoDnsProvider) findZoneSystemNameServer(domain string) (*models.Nam
 	return systemNameServer, nil
 }
 
-func (api *autoDnsProvider) getZone(domain string) (*Zone, error) {
+func (api *autoDNSProvider) getZone(domain string) (*Zone, error) {
 	systemNameServer, err := api.findZoneSystemNameServer(domain)
 	if err != nil {
 		return nil, err
@@ -100,7 +100,7 @@ func (api *autoDnsProvider) getZone(domain string) (*Zone, error) {
 	return responseObject.Data[0], nil
 }
 
-func (api *autoDnsProvider) updateZone(domain string, resourceRecords []*ResourceRecord, nameServers []*models.Nameserver, zoneTTL uint32) error {
+func (api *autoDNSProvider) updateZone(domain string, resourceRecords []*ResourceRecord, nameServers []*models.Nameserver, zoneTTL uint32) error {
 	systemNameServer, err := api.findZoneSystemNameServer(domain)
 
 	if err != nil {
diff --git a/providers/autodns/autoDnsProvider.go b/providers/autodns/autoDnsProvider.go
index e67914874..e23a2b6ae 100644
--- a/providers/autodns/autoDnsProvider.go
+++ b/providers/autodns/autoDnsProvider.go
@@ -3,7 +3,6 @@ package autodns
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"net/http"
 	"net/url"
 	"regexp"
@@ -12,6 +11,7 @@ import (
 
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
+	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"github.com/StackExchange/dnscontrol/v3/pkg/txtutil"
 	"github.com/StackExchange/dnscontrol/v3/providers"
 )
@@ -30,7 +30,7 @@ var features = providers.DocumentationNotes{
 	providers.CanUseTLSA:             providers.Cannot(),
 }
 
-type autoDnsProvider struct {
+type autoDNSProvider struct {
 	baseURL        url.URL
 	defaultHeaders http.Header
 }
@@ -45,7 +45,7 @@ func init() {
 
 // New creates a new API handle.
 func New(settings map[string]string, _ json.RawMessage) (providers.DNSServiceProvider, error) {
-	api := &autoDnsProvider{}
+	api := &autoDNSProvider{}
 
 	api.baseURL = url.URL{
 		Scheme: "https",
@@ -67,7 +67,7 @@ func New(settings map[string]string, _ json.RawMessage) (providers.DNSServicePro
 }
 
 // GetDomainCorrections returns the corrections for a domain.
-func (api *autoDnsProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*models.Correction, error) {
+func (api *autoDNSProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*models.Correction, error) {
 	var changes []*models.RecordConfig
 
 	dc, err := dc.Copy()
@@ -169,7 +169,7 @@ func (api *autoDnsProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*mo
 					err := api.updateZone(domain, resourceRecords, nameServers, zoneTTL)
 
 					if err != nil {
-						fmt.Errorf(err.Error())
+						return fmt.Errorf(err.Error())
 					}
 
 					return nil
@@ -181,7 +181,7 @@ func (api *autoDnsProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*mo
 }
 
 // GetNameservers returns the nameservers for a domain.
-func (api *autoDnsProvider) GetNameservers(domain string) ([]*models.Nameserver, error) {
+func (api *autoDNSProvider) GetNameservers(domain string) ([]*models.Nameserver, error) {
 	zone, err := api.getZone(domain)
 
 	if err != nil {
@@ -192,7 +192,7 @@ func (api *autoDnsProvider) GetNameservers(domain string) ([]*models.Nameserver,
 }
 
 // GetZoneRecords gets the records of a zone and returns them in RecordConfig format.
-func (api *autoDnsProvider) GetZoneRecords(domain string) (models.Records, error) {
+func (api *autoDNSProvider) GetZoneRecords(domain string) (models.Records, error) {
 	zone, _ := api.getZone(domain)
 	existingRecords := make([]*models.RecordConfig, len(zone.ResourceRecords))
 	for i, resourceRecord := range zone.ResourceRecords {
diff --git a/providers/autodns/types.go b/providers/autodns/types.go
index e7db389f2..87039c2fd 100644
--- a/providers/autodns/types.go
+++ b/providers/autodns/types.go
@@ -5,6 +5,7 @@ import (
 	"github.com/StackExchange/dnscontrol/v3/providers/bind"
 )
 
+// ResourceRecord represents DNS records in API calls.
 type ResourceRecord struct {
 
 	// The name of the record.
@@ -29,6 +30,7 @@ type ResourceRecord struct {
 	Value string `json:"value,omitempty"`
 }
 
+// MainAddressRecord represents an address record in API calls.
 type MainAddressRecord struct {
 
 	// TTL of the record (Optionally if not set then Default SOA TTL is used)
@@ -38,6 +40,7 @@ type MainAddressRecord struct {
 	Value string `json:"address,omitempty"`
 }
 
+// Zone represents the Zone in API calls.
 type Zone struct {
 	Origin string `json:"origin"`
 
@@ -60,6 +63,7 @@ type Zone struct {
 	SystemNameServer string `json:"virtualNameServer,omitempty"`
 }
 
+// JSONResponseDataZone represents the response to the DataZone call.
 type JSONResponseDataZone struct {
 
 	// The data for the response. The type of the objects are depending on the request and are also specified in the responseObject value of the response.
diff --git a/providers/axfrddns/axfrddnsProvider.go b/providers/axfrddns/axfrddnsProvider.go
index 802908c95..d8b70ff49 100644
--- a/providers/axfrddns/axfrddnsProvider.go
+++ b/providers/axfrddns/axfrddnsProvider.go
@@ -17,19 +17,18 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"math"
 	"math/rand"
 	"net"
 	"strings"
 	"time"
 
-	"github.com/miekg/dns"
-
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
+	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"github.com/StackExchange/dnscontrol/v3/pkg/txtutil"
 	"github.com/StackExchange/dnscontrol/v3/providers"
+	"github.com/miekg/dns"
 )
 
 const (
diff --git a/providers/azuredns/azureDnsProvider.go b/providers/azuredns/azureDnsProvider.go
index 50b840c16..7a7c5d032 100644
--- a/providers/azuredns/azureDnsProvider.go
+++ b/providers/azuredns/azureDnsProvider.go
@@ -11,7 +11,6 @@ import (
 	aauth "github.com/Azure/azure-sdk-for-go/sdk/azidentity"
 	adns "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/dns/armdns"
 	"github.com/Azure/go-autorest/autorest/to"
-
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
 	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
diff --git a/providers/bind/bindProvider.go b/providers/bind/bindProvider.go
index b2af7241c..7a8d41129 100644
--- a/providers/bind/bindProvider.go
+++ b/providers/bind/bindProvider.go
@@ -22,15 +22,13 @@ import (
 	"strings"
 	"time"
 
-	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
-
-	"github.com/miekg/dns"
-
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
 	"github.com/StackExchange/dnscontrol/v3/pkg/prettyzone"
+	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"github.com/StackExchange/dnscontrol/v3/pkg/txtutil"
 	"github.com/StackExchange/dnscontrol/v3/providers"
+	"github.com/miekg/dns"
 )
 
 var features = providers.DocumentationNotes{
diff --git a/providers/bind/soa.go b/providers/bind/soa.go
index 5c35c92c6..c057e4ec6 100644
--- a/providers/bind/soa.go
+++ b/providers/bind/soa.go
@@ -1,8 +1,6 @@
 package bind
 
-import (
-	"github.com/StackExchange/dnscontrol/v3/models"
-)
+import "github.com/StackExchange/dnscontrol/v3/models"
 
 func makeSoa(origin string, defSoa *SoaDefaults, existing, desired *models.RecordConfig) (*models.RecordConfig, uint32) {
 	// Create a SOA record.  Take data from desired, existing, default,
diff --git a/providers/capabilities.go b/providers/capabilities.go
index 977859de2..b9fd50c0c 100644
--- a/providers/capabilities.go
+++ b/providers/capabilities.go
@@ -2,9 +2,7 @@
 
 package providers
 
-import (
-	"log"
-)
+import "log"
 
 // Capability is a bitmasked set of "features" that a provider supports. Only use constants from this package.
 type Capability uint32
diff --git a/providers/cloudflare/cloudflareProvider.go b/providers/cloudflare/cloudflareProvider.go
index d9761f0f6..3e90e4e1d 100644
--- a/providers/cloudflare/cloudflareProvider.go
+++ b/providers/cloudflare/cloudflareProvider.go
@@ -7,14 +7,13 @@ import (
 	"net"
 	"strings"
 
-	"github.com/cloudflare/cloudflare-go"
-	"github.com/miekg/dns/dnsutil"
-
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
 	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"github.com/StackExchange/dnscontrol/v3/pkg/transform"
 	"github.com/StackExchange/dnscontrol/v3/providers"
+	"github.com/cloudflare/cloudflare-go"
+	"github.com/miekg/dns/dnsutil"
 )
 
 /*
diff --git a/providers/cloudflare/rest.go b/providers/cloudflare/rest.go
index 94387ae63..64dedb08d 100644
--- a/providers/cloudflare/rest.go
+++ b/providers/cloudflare/rest.go
@@ -150,13 +150,13 @@ func (c *cloudflareProvider) createRec(rec *models.RecordConfig, domainID string
 			} else if rec.Type == "DS" {
 				cf.Data = cfDSData(rec)
 			}
-			if resp, err := c.cfClient.CreateDNSRecord(context.Background(), domainID, cf); err != nil {
+			resp, err := c.cfClient.CreateDNSRecord(context.Background(), domainID, cf)
+			if err != nil {
 				return err
-			} else {
-				// Updating id (from the outer scope) by side-effect, required for updating proxy mode
-				id = resp.Result.ID
-				return nil
 			}
+			// Updating id (from the outer scope) by side-effect, required for updating proxy mode
+			id = resp.Result.ID
+			return nil
 		},
 	}}
 	if rec.Metadata[metaProxy] != "off" {
diff --git a/providers/cloudns/cloudnsProvider.go b/providers/cloudns/cloudnsProvider.go
index 07fb974bd..2f54ef516 100644
--- a/providers/cloudns/cloudnsProvider.go
+++ b/providers/cloudns/cloudnsProvider.go
@@ -6,11 +6,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/miekg/dns/dnsutil"
-
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
 	"github.com/StackExchange/dnscontrol/v3/providers"
+	"github.com/miekg/dns/dnsutil"
 )
 
 /*
diff --git a/providers/cscglobal/api.go b/providers/cscglobal/api.go
index 708d2f1af..1207bbbc8 100644
--- a/providers/cscglobal/api.go
+++ b/providers/cscglobal/api.go
@@ -12,7 +12,6 @@ import (
 	"time"
 
 	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
-
 	"github.com/mattn/go-isatty"
 )
 
diff --git a/providers/desec/auditrecords.go b/providers/desec/auditrecords.go
index 5ff25d863..6355323c0 100644
--- a/providers/desec/auditrecords.go
+++ b/providers/desec/auditrecords.go
@@ -1,8 +1,6 @@
 package desec
 
-import (
-	"github.com/StackExchange/dnscontrol/v3/models"
-)
+import "github.com/StackExchange/dnscontrol/v3/models"
 
 // AuditRecords returns a list of errors corresponding to the records
 // that aren't supported by this provider.  If all records are
diff --git a/providers/desec/convert.go b/providers/desec/convert.go
index 731da5c91..760b803d6 100644
--- a/providers/desec/convert.go
+++ b/providers/desec/convert.go
@@ -4,6 +4,7 @@ package desec
 
 import (
 	"fmt"
+
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 )
diff --git a/providers/digitalocean/digitaloceanProvider.go b/providers/digitalocean/digitaloceanProvider.go
index 8244585b1..1e1fde657 100644
--- a/providers/digitalocean/digitaloceanProvider.go
+++ b/providers/digitalocean/digitaloceanProvider.go
@@ -12,9 +12,8 @@ import (
 	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
 	"github.com/StackExchange/dnscontrol/v3/pkg/txtutil"
 	"github.com/StackExchange/dnscontrol/v3/providers"
-	"github.com/miekg/dns/dnsutil"
-
 	"github.com/digitalocean/godo"
+	"github.com/miekg/dns/dnsutil"
 	"golang.org/x/oauth2"
 )
 
diff --git a/providers/dnsimple/dnsimpleProvider.go b/providers/dnsimple/dnsimpleProvider.go
index 22825fdc5..c5f03b14d 100644
--- a/providers/dnsimple/dnsimpleProvider.go
+++ b/providers/dnsimple/dnsimpleProvider.go
@@ -8,13 +8,12 @@ import (
 	"strconv"
 	"strings"
 
-	dnsimpleapi "github.com/dnsimple/dnsimple-go/dnsimple"
-	"golang.org/x/oauth2"
-
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
 	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"github.com/StackExchange/dnscontrol/v3/providers"
+	dnsimpleapi "github.com/dnsimple/dnsimple-go/dnsimple"
+	"golang.org/x/oauth2"
 )
 
 var features = providers.DocumentationNotes{
diff --git a/providers/dnsmadeeasy/api.go b/providers/dnsmadeeasy/api.go
index 305d64d45..d184dc9b1 100644
--- a/providers/dnsmadeeasy/api.go
+++ b/providers/dnsmadeeasy/api.go
@@ -2,9 +2,10 @@ package dnsmadeeasy
 
 import (
 	"fmt"
-	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"net/http"
 	"time"
+
+	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 )
 
 type dnsMadeEasyProvider struct {
diff --git a/providers/domainnameshop/dns_test.go b/providers/domainnameshop/dns_test.go
index dc8f51f11..7f483ff2c 100644
--- a/providers/domainnameshop/dns_test.go
+++ b/providers/domainnameshop/dns_test.go
@@ -1,8 +1,6 @@
 package domainnameshop
 
-import (
-	"testing"
-)
+import "testing"
 
 func TestFixTTL(t *testing.T) {
 	for i, test := range []struct {
diff --git a/providers/exoscale/exoscaleProvider.go b/providers/exoscale/exoscaleProvider.go
index d0bfc0c6c..0a9f4ce41 100644
--- a/providers/exoscale/exoscaleProvider.go
+++ b/providers/exoscale/exoscaleProvider.go
@@ -4,14 +4,13 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"strings"
 
-	"github.com/exoscale/egoscale"
-
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
+	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"github.com/StackExchange/dnscontrol/v3/providers"
+	"github.com/exoscale/egoscale"
 )
 
 type exoscaleProvider struct {
diff --git a/providers/gandiv5/convert.go b/providers/gandiv5/convert.go
index cfcf79232..ec0059980 100644
--- a/providers/gandiv5/convert.go
+++ b/providers/gandiv5/convert.go
@@ -5,10 +5,9 @@ package gandiv5
 import (
 	"fmt"
 
-	"github.com/go-gandi/go-gandi/livedns"
-
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
+	"github.com/go-gandi/go-gandi/livedns"
 )
 
 // nativeToRecord takes a DNS record from Gandi and returns a native RecordConfig struct.
diff --git a/providers/gandiv5/gandi_v5Provider.go b/providers/gandiv5/gandi_v5Provider.go
index cc624c80a..b186fb679 100644
--- a/providers/gandiv5/gandi_v5Provider.go
+++ b/providers/gandiv5/gandi_v5Provider.go
@@ -21,17 +21,14 @@ import (
 	"strconv"
 	"strings"
 
-	//gandi "github.com/go-gandi/go-gandi"
-	"github.com/go-gandi/go-gandi"
-	"github.com/go-gandi/go-gandi/config"
-
-	"github.com/miekg/dns/dnsutil"
-
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
 	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"github.com/StackExchange/dnscontrol/v3/pkg/txtutil"
 	"github.com/StackExchange/dnscontrol/v3/providers"
+	"github.com/go-gandi/go-gandi"
+	"github.com/go-gandi/go-gandi/config"
+	"github.com/miekg/dns/dnsutil"
 )
 
 // Section 1: Register this provider in the system.
diff --git a/providers/gcloud/gcloudProvider.go b/providers/gcloud/gcloudProvider.go
index 22c533072..4f8abef6e 100644
--- a/providers/gcloud/gcloudProvider.go
+++ b/providers/gcloud/gcloudProvider.go
@@ -9,18 +9,15 @@ import (
 	"strings"
 	"time"
 
-	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
-
-	"google.golang.org/api/googleapi"
-	"google.golang.org/api/option"
-
-	gauth "golang.org/x/oauth2/google"
-
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
+	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"github.com/StackExchange/dnscontrol/v3/pkg/txtutil"
 	"github.com/StackExchange/dnscontrol/v3/providers"
+	gauth "golang.org/x/oauth2/google"
 	gdns "google.golang.org/api/dns/v1"
+	"google.golang.org/api/googleapi"
+	"google.golang.org/api/option"
 )
 
 var features = providers.DocumentationNotes{
@@ -86,7 +83,7 @@ func New(cfg map[string]string, metadata json.RawMessage) (providers.DNSServiceP
 		var err error
 		hc, err = gauth.DefaultClient(ctx, "https://www.googleapis.com/auth/ndev.clouddns.readwrite")
 		if err != nil {
-			return nil, fmt.Errorf("No creds.json private_key found and ADC failed with:\n%s", err)
+			return nil, fmt.Errorf("no creds.json private_key found and ADC failed with:\n%s", err)
 		}
 	}
 	// FIXME(tlim): Is it a problem that ctx is included with hc and in
diff --git a/providers/hetzner/types.go b/providers/hetzner/types.go
index 4479aff27..0887a13e1 100644
--- a/providers/hetzner/types.go
+++ b/providers/hetzner/types.go
@@ -1,8 +1,9 @@
 package hetzner
 
 import (
-	"github.com/StackExchange/dnscontrol/v3/models"
 	"strings"
+
+	"github.com/StackExchange/dnscontrol/v3/models"
 )
 
 type bulkCreateRecordsRequest struct {
diff --git a/providers/hexonet/error.go b/providers/hexonet/error.go
index cdacd4186..6713110ba 100644
--- a/providers/hexonet/error.go
+++ b/providers/hexonet/error.go
@@ -2,6 +2,7 @@ package hexonet
 
 import (
 	"fmt"
+
 	"github.com/hexonet/go-sdk/v3/response"
 )
 
diff --git a/providers/hexonet/hexonetProvider.go b/providers/hexonet/hexonetProvider.go
index 59eb70924..2d5712f61 100644
--- a/providers/hexonet/hexonetProvider.go
+++ b/providers/hexonet/hexonetProvider.go
@@ -4,6 +4,7 @@ package hexonet
 import (
 	"encoding/json"
 	"fmt"
+
 	"github.com/StackExchange/dnscontrol/v3/pkg/version"
 	"github.com/StackExchange/dnscontrol/v3/providers"
 	hxcl "github.com/hexonet/go-sdk/v3/apiclient"
diff --git a/providers/hexonet/records.go b/providers/hexonet/records.go
index 9125852ec..59150670a 100644
--- a/providers/hexonet/records.go
+++ b/providers/hexonet/records.go
@@ -4,13 +4,13 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"regexp"
 	"strconv"
 	"strings"
 
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
+	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"github.com/StackExchange/dnscontrol/v3/pkg/txtutil"
 )
 
@@ -160,12 +160,13 @@ func toRecord(r *HXRecord, origin string) *models.RecordConfig {
 	return rc
 }
 
-func (n *HXClient) showCommand(cmd map[string]string) {
+func (n *HXClient) showCommand(cmd map[string]string) error {
 	b, err := json.MarshalIndent(cmd, "", "  ")
 	if err != nil {
-		fmt.Errorf("error: %w", err)
+		return fmt.Errorf("error: %w", err)
 	}
 	printer.Printf(string(b))
+	return nil
 }
 
 func (n *HXClient) updateZoneBy(params map[string]interface{}, domain string) error {
diff --git a/providers/inwx/inwxProvider.go b/providers/inwx/inwxProvider.go
index 2fcbee703..75c4be22b 100644
--- a/providers/inwx/inwxProvider.go
+++ b/providers/inwx/inwxProvider.go
@@ -3,16 +3,15 @@ package inwx
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"sort"
 	"strings"
 	"time"
 
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
+	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"github.com/StackExchange/dnscontrol/v3/pkg/txtutil"
 	"github.com/StackExchange/dnscontrol/v3/providers"
-
 	"github.com/nrdcg/goinwx"
 	"github.com/pquerna/otp/totp"
 )
diff --git a/providers/linode/linodeProvider.go b/providers/linode/linodeProvider.go
index a7aad227b..fb30502f2 100644
--- a/providers/linode/linodeProvider.go
+++ b/providers/linode/linodeProvider.go
@@ -9,12 +9,11 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/miekg/dns/dnsutil"
-	"golang.org/x/oauth2"
-
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
 	"github.com/StackExchange/dnscontrol/v3/providers"
+	"github.com/miekg/dns/dnsutil"
+	"golang.org/x/oauth2"
 )
 
 /*
diff --git a/providers/linode/linodeProvider_test.go b/providers/linode/linodeProvider_test.go
index 3ec92cc34..9dfff6834 100644
--- a/providers/linode/linodeProvider_test.go
+++ b/providers/linode/linodeProvider_test.go
@@ -1,8 +1,6 @@
 package linode
 
-import (
-	"testing"
-)
+import "testing"
 
 func TestFixTTL(t *testing.T) {
 	for i, test := range []struct {
diff --git a/providers/msdns/convert.go b/providers/msdns/convert.go
index 1f89eb35e..d2822edcf 100644
--- a/providers/msdns/convert.go
+++ b/providers/msdns/convert.go
@@ -114,7 +114,8 @@ func nativeToRecords(nr nativeRecord, origin string) (*models.RecordConfig, erro
 		//	uprops["SerialNumber"], uprops["RefreshInterval"], uprops["RetryDelay"],
 		//	uprops["ExpireLimit"], uprops["MinimumTimeToLive"])
 	case "TXT":
-		rc.SetTargetTXTString(sprops["DescriptiveText"])
+		//rc.SetTargetTXTString(sprops["DescriptiveText"])
+		rc.SetTargetTXTfromRFC1035Quoted(sprops["DescriptiveText"])
 	default:
 		return nil, fmt.Errorf(
 			"msdns/convert.go:nativeToRecord rtype=%q unknown: props=%+v and %+v",
diff --git a/providers/msdns/msdnsProvider.go b/providers/msdns/msdnsProvider.go
index aca2350f2..bf8ab7b8b 100644
--- a/providers/msdns/msdnsProvider.go
+++ b/providers/msdns/msdnsProvider.go
@@ -4,9 +4,8 @@ import (
 	"encoding/json"
 	"runtime"
 
-	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
-
 	"github.com/StackExchange/dnscontrol/v3/models"
+	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"github.com/StackExchange/dnscontrol/v3/pkg/txtutil"
 	"github.com/StackExchange/dnscontrol/v3/providers"
 )
diff --git a/providers/msdns/naptr.go b/providers/msdns/naptr.go
index bd026c908..99fc5a5a9 100644
--- a/providers/msdns/naptr.go
+++ b/providers/msdns/naptr.go
@@ -7,11 +7,11 @@ import (
 	"bytes"
 	"encoding/hex"
 	"fmt"
-	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"log"
 	"strconv"
 
 	"github.com/StackExchange/dnscontrol/v3/models"
+	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 )
 
 func generatePSCreateNaptr(dnsServerName, domain string, rec *models.RecordConfig) string {
diff --git a/providers/msdns/powershell.go b/providers/msdns/powershell.go
index ae0e1fd85..be1489d2f 100644
--- a/providers/msdns/powershell.go
+++ b/providers/msdns/powershell.go
@@ -7,9 +7,8 @@ import (
 	"log"
 	"os"
 
-	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
-
 	"github.com/StackExchange/dnscontrol/v3/models"
+	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"github.com/TomOnTime/utfutil"
 	ps "github.com/bhendo/go-powershell"
 	"github.com/bhendo/go-powershell/backend"
diff --git a/providers/namecheap/namecheapProvider.go b/providers/namecheap/namecheapProvider.go
index f2fae5675..48f628132 100644
--- a/providers/namecheap/namecheapProvider.go
+++ b/providers/namecheap/namecheapProvider.go
@@ -7,13 +7,12 @@ import (
 	"strings"
 	"time"
 
-	nc "github.com/billputer/go-namecheap"
-	"golang.org/x/net/publicsuffix"
-
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
 	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"github.com/StackExchange/dnscontrol/v3/providers"
+	nc "github.com/billputer/go-namecheap"
+	"golang.org/x/net/publicsuffix"
 )
 
 // NamecheapDefaultNs lists the default nameservers for this provider.
diff --git a/providers/namedotcom/namedotcomProvider.go b/providers/namedotcom/namedotcomProvider.go
index 7891a49ac..e395929ee 100644
--- a/providers/namedotcom/namedotcomProvider.go
+++ b/providers/namedotcom/namedotcomProvider.go
@@ -6,9 +6,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/namedotcom/go/namecom"
-
 	"github.com/StackExchange/dnscontrol/v3/providers"
+	"github.com/namedotcom/go/namecom"
 )
 
 const defaultAPIBase = "api.name.com"
diff --git a/providers/namedotcom/records.go b/providers/namedotcom/records.go
index e76908bf1..2d81a8a22 100644
--- a/providers/namedotcom/records.go
+++ b/providers/namedotcom/records.go
@@ -6,10 +6,9 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/namedotcom/go/namecom"
-
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
+	"github.com/namedotcom/go/namecom"
 )
 
 var defaultNameservers = []*models.Nameserver{
diff --git a/providers/namedotcom/zones.go b/providers/namedotcom/zones.go
index 93f45140b..744da5396 100644
--- a/providers/namedotcom/zones.go
+++ b/providers/namedotcom/zones.go
@@ -1,8 +1,6 @@
 package namedotcom
 
-import (
-	"github.com/namedotcom/go/namecom"
-)
+import "github.com/namedotcom/go/namecom"
 
 // ListZones returns all the zones in an account
 func (n *namedotcomProvider) ListZones() ([]string, error) {
diff --git a/providers/netcup/netcupProvider.go b/providers/netcup/netcupProvider.go
index eb7ec0d9d..328bd0c30 100644
--- a/providers/netcup/netcupProvider.go
+++ b/providers/netcup/netcupProvider.go
@@ -3,10 +3,9 @@ package netcup
 import (
 	"encoding/json"
 	"fmt"
+
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
-	// no need for txtutil.SplitSingleLongTxt in function GetDomainCorrections
-	// "github.com/StackExchange/dnscontrol/v3/pkg/txtutil"
 	"github.com/StackExchange/dnscontrol/v3/providers"
 )
 
diff --git a/providers/ns1/ns1Provider.go b/providers/ns1/ns1Provider.go
index 298a48efb..c95a26ffb 100644
--- a/providers/ns1/ns1Provider.go
+++ b/providers/ns1/ns1Provider.go
@@ -8,13 +8,12 @@ import (
 	"strconv"
 	"strings"
 
-	"gopkg.in/ns1/ns1-go.v2/rest"
-	"gopkg.in/ns1/ns1-go.v2/rest/model/dns"
-	"gopkg.in/ns1/ns1-go.v2/rest/model/filter"
-
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
 	"github.com/StackExchange/dnscontrol/v3/providers"
+	"gopkg.in/ns1/ns1-go.v2/rest"
+	"gopkg.in/ns1/ns1-go.v2/rest/model/dns"
+	"gopkg.in/ns1/ns1-go.v2/rest/model/filter"
 )
 
 var docNotes = providers.DocumentationNotes{
diff --git a/providers/octodns/octodnsProvider.go b/providers/octodns/octodnsProvider.go
index ea692aef6..3704b9436 100644
--- a/providers/octodns/octodnsProvider.go
+++ b/providers/octodns/octodnsProvider.go
@@ -22,7 +22,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"log"
 	"os"
 	"path/filepath"
@@ -30,6 +29,7 @@ import (
 
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
+	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"github.com/StackExchange/dnscontrol/v3/pkg/txtutil"
 	"github.com/StackExchange/dnscontrol/v3/providers"
 	"github.com/StackExchange/dnscontrol/v3/providers/octodns/octoyaml"
diff --git a/providers/octodns/octoyaml/js.go b/providers/octodns/octoyaml/js.go
index 106614f88..3e59b3b7b 100644
--- a/providers/octodns/octoyaml/js.go
+++ b/providers/octodns/octoyaml/js.go
@@ -4,14 +4,10 @@ import (
 	"encoding/json"
 	"os"
 
-	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
-
 	"github.com/StackExchange/dnscontrol/v3/models"
+	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"github.com/StackExchange/dnscontrol/v3/pkg/transform"
-
 	"github.com/robertkrimen/otto"
-	// load underscore js into vm by default
-
 	_ "github.com/robertkrimen/otto/underscore" // required by otto
 )
 
diff --git a/providers/octodns/octoyaml/read.go b/providers/octodns/octoyaml/read.go
index 323602328..0b9cf8799 100644
--- a/providers/octodns/octoyaml/read.go
+++ b/providers/octodns/octoyaml/read.go
@@ -14,9 +14,8 @@ import (
 	"reflect"
 	"strconv"
 
-	yaml "gopkg.in/yaml.v2"
-
 	"github.com/StackExchange/dnscontrol/v3/models"
+	yaml "gopkg.in/yaml.v2"
 )
 
 // ReadYaml parses a yaml input and returns a list of RecordConfigs
diff --git a/providers/opensrs/opensrsProvider.go b/providers/opensrs/opensrsProvider.go
index cf680a87f..2ce685c69 100644
--- a/providers/opensrs/opensrsProvider.go
+++ b/providers/opensrs/opensrsProvider.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/providers"
-
 	opensrs "github.com/philhug/opensrs-go/opensrs"
 )
 
diff --git a/providers/oracle/oracleProvider.go b/providers/oracle/oracleProvider.go
index 87381fb9b..c65ed058b 100644
--- a/providers/oracle/oracleProvider.go
+++ b/providers/oracle/oracleProvider.go
@@ -6,16 +6,14 @@ import (
 	"strings"
 	"time"
 
-	"github.com/oracle/oci-go-sdk/v32/dns"
-
-	"github.com/oracle/oci-go-sdk/v32/common"
-	"github.com/oracle/oci-go-sdk/v32/example/helpers"
-
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
 	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"github.com/StackExchange/dnscontrol/v3/pkg/txtutil"
 	"github.com/StackExchange/dnscontrol/v3/providers"
+	"github.com/oracle/oci-go-sdk/v32/common"
+	"github.com/oracle/oci-go-sdk/v32/dns"
+	"github.com/oracle/oci-go-sdk/v32/example/helpers"
 )
 
 var features = providers.DocumentationNotes{
diff --git a/providers/powerdns/convert.go b/providers/powerdns/convert.go
index ed8c6fc55..5aefc6f0f 100644
--- a/providers/powerdns/convert.go
+++ b/providers/powerdns/convert.go
@@ -1,9 +1,10 @@
 package powerdns
 
 import (
+	"strings"
+
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/mittwald/go-powerdns/apis/zones"
-	"strings"
 )
 
 // toRecordConfig converts a PowerDNS DNSRecord to a RecordConfig. #rtype_variations
diff --git a/providers/powerdns/convert_test.go b/providers/powerdns/convert_test.go
index 985d4162b..a88fd2910 100644
--- a/providers/powerdns/convert_test.go
+++ b/providers/powerdns/convert_test.go
@@ -2,11 +2,12 @@ package powerdns
 
 import (
 	"fmt"
-	"github.com/mittwald/go-powerdns/apis/zones"
 	"strings"
 	"testing"
+
+	"github.com/mittwald/go-powerdns/apis/zones"
+	"github.com/stretchr/testify/assert"
 )
-import "github.com/stretchr/testify/assert"
 
 func TestToRecordConfig(t *testing.T) {
 	record := zones.Record{
diff --git a/providers/powerdns/dns.go b/providers/powerdns/dns.go
index d4bc5525d..8284b9709 100644
--- a/providers/powerdns/dns.go
+++ b/providers/powerdns/dns.go
@@ -2,12 +2,13 @@ package powerdns
 
 import (
 	"context"
+	"net/http"
+	"strings"
+
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
 	"github.com/mittwald/go-powerdns/apis/zones"
 	"github.com/mittwald/go-powerdns/pdnshttp"
-	"net/http"
-	"strings"
 )
 
 // GetNameservers returns the nameservers for a domain.
diff --git a/providers/powerdns/powerdnsProvider.go b/providers/powerdns/powerdnsProvider.go
index 9526ef5df..69baca541 100644
--- a/providers/powerdns/powerdnsProvider.go
+++ b/providers/powerdns/powerdnsProvider.go
@@ -3,6 +3,7 @@ package powerdns
 import (
 	"encoding/json"
 	"fmt"
+
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/providers"
 	pdns "github.com/mittwald/go-powerdns"
diff --git a/providers/route53/route53Provider.go b/providers/route53/route53Provider.go
index 621163b1d..e4c4dbf5e 100644
--- a/providers/route53/route53Provider.go
+++ b/providers/route53/route53Provider.go
@@ -11,8 +11,11 @@ import (
 	"time"
 	"unicode/utf8"
 
+	"github.com/StackExchange/dnscontrol/v3/models"
+	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
 	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
-
+	"github.com/StackExchange/dnscontrol/v3/pkg/txtutil"
+	"github.com/StackExchange/dnscontrol/v3/providers"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/credentials"
@@ -20,11 +23,6 @@ import (
 	r53Types "github.com/aws/aws-sdk-go-v2/service/route53/types"
 	r53d "github.com/aws/aws-sdk-go-v2/service/route53domains"
 	r53dTypes "github.com/aws/aws-sdk-go-v2/service/route53domains/types"
-
-	"github.com/StackExchange/dnscontrol/v3/models"
-	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
-	"github.com/StackExchange/dnscontrol/v3/pkg/txtutil"
-	"github.com/StackExchange/dnscontrol/v3/providers"
 )
 
 type route53Provider struct {
diff --git a/providers/rwth/api.go b/providers/rwth/api.go
index 5a3027f25..4417637e1 100644
--- a/providers/rwth/api.go
+++ b/providers/rwth/api.go
@@ -22,6 +22,7 @@ const (
 	baseURL = "https://noc-portal.rz.rwth-aachen.de/dns-admin/api/v1"
 )
 
+// RecordReply represents a DNS Record in an API.
 type RecordReply struct {
 	ID        int       `json:"id"`
 	ZoneID    int       `json:"zone_id"`
diff --git a/providers/rwth/convert.go b/providers/rwth/convert.go
index 9d35b5184..93f63452e 100644
--- a/providers/rwth/convert.go
+++ b/providers/rwth/convert.go
@@ -2,11 +2,12 @@ package rwth
 
 import (
 	"fmt"
+	"io"
+	"strings"
+
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/prettyzone"
 	"github.com/miekg/dns"
-	"io"
-	"strings"
 )
 
 // Print the generateZoneFileHelper
@@ -46,6 +47,7 @@ func NewRR(s string) (dns.RR, error) {
 	return ReadRR(strings.NewReader(s))
 }
 
+// ReadRR reads an RR from r.
 func ReadRR(r io.Reader) (dns.RR, error) {
 	zp := dns.NewZoneParser(r, ".", "")
 	zp.SetDefaultTTL(172800)
diff --git a/providers/rwth/dns.go b/providers/rwth/dns.go
index fabaa9778..8c5edd2a3 100644
--- a/providers/rwth/dns.go
+++ b/providers/rwth/dns.go
@@ -2,11 +2,13 @@ package rwth
 
 import (
 	"fmt"
+
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
 	"github.com/StackExchange/dnscontrol/v3/pkg/txtutil"
 )
 
+// RWTHDefaultNs is the default DNS NS for this provider.
 var RWTHDefaultNs = []string{"dns-1.dfn.de", "dns-2.dfn.de", "zs1.rz.rwth-aachen.de", "zs2.rz.rwth-aachen.de"}
 
 // GetZoneRecords gets the records of a zone and returns them in RecordConfig format.
@@ -27,6 +29,7 @@ func (api *rwthProvider) GetNameservers(domain string) ([]*models.Nameserver, er
 	return models.ToNameservers(RWTHDefaultNs)
 }
 
+// GetDomainCorrections returns a list of corretions to execute.
 func (api *rwthProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*models.Correction, error) {
 	dc, err := dc.Copy()
 	if err != nil {
diff --git a/providers/rwth/rwthProvider.go b/providers/rwth/rwthProvider.go
index fe7c45ff3..fca9b7e9b 100644
--- a/providers/rwth/rwthProvider.go
+++ b/providers/rwth/rwthProvider.go
@@ -3,6 +3,7 @@ package rwth
 import (
 	"encoding/json"
 	"fmt"
+
 	"github.com/StackExchange/dnscontrol/v3/providers"
 )
 
@@ -38,6 +39,7 @@ func init() {
 	providers.RegisterDomainServiceProviderType("RWTH", fns, features)
 }
 
+// New allocates a DNS service provider.
 func New(settings map[string]string, _ json.RawMessage) (providers.DNSServiceProvider, error) {
 	if settings["api_token"] == "" {
 		return nil, fmt.Errorf("missing RWTH api_token")
diff --git a/providers/softlayer/softlayerProvider.go b/providers/softlayer/softlayerProvider.go
index 26c0c2748..18050d943 100644
--- a/providers/softlayer/softlayerProvider.go
+++ b/providers/softlayer/softlayerProvider.go
@@ -3,18 +3,17 @@ package softlayer
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
 	"regexp"
 	"strings"
 
+	"github.com/StackExchange/dnscontrol/v3/models"
+	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
+	"github.com/StackExchange/dnscontrol/v3/pkg/printer"
+	"github.com/StackExchange/dnscontrol/v3/providers"
 	"github.com/softlayer/softlayer-go/datatypes"
 	"github.com/softlayer/softlayer-go/filter"
 	"github.com/softlayer/softlayer-go/services"
 	"github.com/softlayer/softlayer-go/session"
-
-	"github.com/StackExchange/dnscontrol/v3/models"
-	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
-	"github.com/StackExchange/dnscontrol/v3/providers"
 )
 
 // softlayerProvider is the protocol handle for this provider.
diff --git a/providers/vultr/vultrProvider.go b/providers/vultr/vultrProvider.go
index e5db81f8b..6244fc1c3 100644
--- a/providers/vultr/vultrProvider.go
+++ b/providers/vultr/vultrProvider.go
@@ -8,11 +8,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/vultr/govultr"
-
 	"github.com/StackExchange/dnscontrol/v3/models"
 	"github.com/StackExchange/dnscontrol/v3/pkg/diff"
 	"github.com/StackExchange/dnscontrol/v3/providers"
+	"github.com/vultr/govultr"
 )
 
 /*