diff --git a/core/coreiface/block.go b/core/coreiface/block.go
index b105b079d..49ffe75d7 100644
--- a/core/coreiface/block.go
+++ b/core/coreiface/block.go
@@ -2,9 +2,10 @@ package iface
 
 import (
 	"context"
-	path "github.com/ipfs/interface-go-ipfs-core/path"
 	"io"
 
+	path "github.com/ipfs/interface-go-ipfs-core/path"
+
 	"github.com/ipfs/interface-go-ipfs-core/options"
 )
 
diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index 5f49e74a3..81a20ee2b 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -2,6 +2,7 @@ package iface
 
 import (
 	"context"
+
 	path "github.com/ipfs/interface-go-ipfs-core/path"
 
 	"github.com/ipfs/interface-go-ipfs-core/options"
diff --git a/core/coreiface/key.go b/core/coreiface/key.go
index db729b3b4..967255665 100644
--- a/core/coreiface/key.go
+++ b/core/coreiface/key.go
@@ -2,6 +2,7 @@ package iface
 
 import (
 	"context"
+
 	path "github.com/ipfs/interface-go-ipfs-core/path"
 
 	"github.com/ipfs/interface-go-ipfs-core/options"
diff --git a/core/coreiface/name.go b/core/coreiface/name.go
index 3dc9f6878..d2725e028 100644
--- a/core/coreiface/name.go
+++ b/core/coreiface/name.go
@@ -3,6 +3,7 @@ package iface
 import (
 	"context"
 	"errors"
+
 	path "github.com/ipfs/interface-go-ipfs-core/path"
 
 	"github.com/ipfs/interface-go-ipfs-core/options"
diff --git a/core/coreiface/object.go b/core/coreiface/object.go
index 86536d421..733dc2bee 100644
--- a/core/coreiface/object.go
+++ b/core/coreiface/object.go
@@ -2,9 +2,10 @@ package iface
 
 import (
 	"context"
-	path "github.com/ipfs/interface-go-ipfs-core/path"
 	"io"
 
+	path "github.com/ipfs/interface-go-ipfs-core/path"
+
 	"github.com/ipfs/interface-go-ipfs-core/options"
 
 	"github.com/ipfs/go-cid"
diff --git a/core/coreiface/options/key.go b/core/coreiface/options/key.go
index 80beea352..4bc53a65f 100644
--- a/core/coreiface/options/key.go
+++ b/core/coreiface/options/key.go
@@ -69,7 +69,7 @@ func (keyOpts) Type(algorithm string) KeyGenerateOption {
 // generated. Default is -1
 //
 // value of -1 means 'use default size for key type':
-//  * 2048 for RSA
+//   - 2048 for RSA
 func (keyOpts) Size(size int) KeyGenerateOption {
 	return func(settings *KeyGenerateSettings) error {
 		settings.Size = size
diff --git a/core/coreiface/options/name.go b/core/coreiface/options/name.go
index 59aaf2ca3..aa8082863 100644
--- a/core/coreiface/options/name.go
+++ b/core/coreiface/options/name.go
@@ -113,7 +113,6 @@ func (nameOpts) Cache(cache bool) NameResolveOption {
 	}
 }
 
-//
 func (nameOpts) ResolveOption(opt ropts.ResolveOpt) NameResolveOption {
 	return func(settings *NameResolveSettings) error {
 		settings.ResolveOpts = append(settings.ResolveOpts, opt)
diff --git a/core/coreiface/options/pin.go b/core/coreiface/options/pin.go
index 5014a2d2b..75c2b8a26 100644
--- a/core/coreiface/options/pin.go
+++ b/core/coreiface/options/pin.go
@@ -164,11 +164,11 @@ func (pinLsOpts) Indirect() PinLsOption {
 // type.
 //
 // Supported values:
-// * "direct" - directly pinned objects
-// * "recursive" - roots of recursive pins
-// * "indirect" - indirectly pinned objects (referenced by recursively pinned
-//    objects)
-// * "all" - all pinned objects (default)
+//   - "direct" - directly pinned objects
+//   - "recursive" - roots of recursive pins
+//   - "indirect" - indirectly pinned objects (referenced by recursively pinned
+//     objects)
+//   - "all" - all pinned objects (default)
 func (pinLsOpts) Type(typeStr string) (PinLsOption, error) {
 	switch typeStr {
 	case "all", "direct", "indirect", "recursive":
@@ -182,11 +182,11 @@ func (pinLsOpts) Type(typeStr string) (PinLsOption, error) {
 // be returned
 //
 // Supported values:
-// * "direct" - directly pinned objects
-// * "recursive" - roots of recursive pins
-// * "indirect" - indirectly pinned objects (referenced by recursively pinned
-//    objects)
-// * "all" - all pinned objects (default)
+//   - "direct" - directly pinned objects
+//   - "recursive" - roots of recursive pins
+//   - "indirect" - indirectly pinned objects (referenced by recursively pinned
+//     objects)
+//   - "all" - all pinned objects (default)
 func (pinLsOpts) pinType(t string) PinLsOption {
 	return func(settings *PinLsSettings) error {
 		settings.Type = t
@@ -224,11 +224,11 @@ func (pinIsPinnedOpts) Indirect() PinIsPinnedOption {
 // type.
 //
 // Supported values:
-// * "direct" - directly pinned objects
-// * "recursive" - roots of recursive pins
-// * "indirect" - indirectly pinned objects (referenced by recursively pinned
-//    objects)
-// * "all" - all pinned objects (default)
+//   - "direct" - directly pinned objects
+//   - "recursive" - roots of recursive pins
+//   - "indirect" - indirectly pinned objects (referenced by recursively pinned
+//     objects)
+//   - "all" - all pinned objects (default)
 func (pinIsPinnedOpts) Type(typeStr string) (PinIsPinnedOption, error) {
 	switch typeStr {
 	case "all", "direct", "indirect", "recursive":
@@ -242,11 +242,11 @@ func (pinIsPinnedOpts) Type(typeStr string) (PinIsPinnedOption, error) {
 // pin is expected to be, speeding up the research.
 //
 // Supported values:
-// * "direct" - directly pinned objects
-// * "recursive" - roots of recursive pins
-// * "indirect" - indirectly pinned objects (referenced by recursively pinned
-//    objects)
-// * "all" - all pinned objects (default)
+//   - "direct" - directly pinned objects
+//   - "recursive" - roots of recursive pins
+//   - "indirect" - indirectly pinned objects (referenced by recursively pinned
+//     objects)
+//   - "all" - all pinned objects (default)
 func (pinIsPinnedOpts) pinType(t string) PinIsPinnedOption {
 	return func(settings *PinIsPinnedSettings) error {
 		settings.WithType = t
diff --git a/core/coreiface/path/path.go b/core/coreiface/path/path.go
index 01b1673b1..e2562936d 100644
--- a/core/coreiface/path/path.go
+++ b/core/coreiface/path/path.go
@@ -15,7 +15,7 @@ import (
 // * /ipfs - Immutable unixfs path (files)
 // * /ipld - Immutable ipld path (data)
 // * /ipns - Mutable names. Usually resolves to one of the immutable paths
-//TODO: /local (MFS)
+// TODO: /local (MFS)
 type Path interface {
 	// String returns the path as a string.
 	String() string
diff --git a/core/coreiface/pin.go b/core/coreiface/pin.go
index 4c1788c68..6205a9b20 100644
--- a/core/coreiface/pin.go
+++ b/core/coreiface/pin.go
@@ -2,6 +2,7 @@ package iface
 
 import (
 	"context"
+
 	path "github.com/ipfs/interface-go-ipfs-core/path"
 
 	"github.com/ipfs/interface-go-ipfs-core/options"
diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index 916e52dd3..a81969916 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"io"
-	"io/ioutil"
 	"strings"
 	"testing"
 
@@ -211,7 +210,7 @@ func (tp *TestSuite) TestBlockGet(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	d, err := ioutil.ReadAll(r)
+	d, err := io.ReadAll(r)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -249,7 +248,7 @@ func (tp *TestSuite) TestBlockRm(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	d, err := ioutil.ReadAll(r)
+	d, err := io.ReadAll(r)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/core/coreiface/tests/dag.go b/core/coreiface/tests/dag.go
index 6f9d9659e..5ea0d3eb1 100644
--- a/core/coreiface/tests/dag.go
+++ b/core/coreiface/tests/dag.go
@@ -2,12 +2,13 @@ package tests
 
 import (
 	"context"
-	path "github.com/ipfs/interface-go-ipfs-core/path"
 	"math"
 	gopath "path"
 	"strings"
 	"testing"
 
+	path "github.com/ipfs/interface-go-ipfs-core/path"
+
 	coreiface "github.com/ipfs/interface-go-ipfs-core"
 
 	ipldcbor "github.com/ipfs/go-ipld-cbor"
diff --git a/core/coreiface/tests/object.go b/core/coreiface/tests/object.go
index e8ab1a7f4..c3437853c 100644
--- a/core/coreiface/tests/object.go
+++ b/core/coreiface/tests/object.go
@@ -4,11 +4,11 @@ import (
 	"bytes"
 	"context"
 	"encoding/hex"
-	"io/ioutil"
+	"io"
 	"strings"
 	"testing"
 
-	"github.com/ipfs/interface-go-ipfs-core"
+	iface "github.com/ipfs/interface-go-ipfs-core"
 	opt "github.com/ipfs/interface-go-ipfs-core/options"
 )
 
@@ -143,7 +143,7 @@ func (tp *TestSuite) TestObjectData(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	data, err := ioutil.ReadAll(r)
+	data, err := io.ReadAll(r)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -383,7 +383,7 @@ func (tp *TestSuite) TestObjectAddData(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	data, err := ioutil.ReadAll(r)
+	data, err := io.ReadAll(r)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -416,7 +416,7 @@ func (tp *TestSuite) TestObjectSetData(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	data, err := ioutil.ReadAll(r)
+	data, err := io.ReadAll(r)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/core/coreiface/tests/pin.go b/core/coreiface/tests/pin.go
index d378d1015..ad1a0fdd2 100644
--- a/core/coreiface/tests/pin.go
+++ b/core/coreiface/tests/pin.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ipfs/interface-go-ipfs-core"
+	iface "github.com/ipfs/interface-go-ipfs-core"
 	opt "github.com/ipfs/interface-go-ipfs-core/options"
 	"github.com/ipfs/interface-go-ipfs-core/path"
 
diff --git a/core/coreiface/tests/pubsub.go b/core/coreiface/tests/pubsub.go
index f8339f228..18da2103d 100644
--- a/core/coreiface/tests/pubsub.go
+++ b/core/coreiface/tests/pubsub.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ipfs/interface-go-ipfs-core"
+	iface "github.com/ipfs/interface-go-ipfs-core"
 	"github.com/ipfs/interface-go-ipfs-core/options"
 )
 
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index f47d34d0a..05226dbbf 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -6,7 +6,6 @@ import (
 	"encoding/hex"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math"
 	"math/rand"
 	"os"
@@ -113,7 +112,7 @@ func (tp *TestSuite) TestAdd(t *testing.T) {
 		return path.IpfsPath(c)
 	}
 
-	rf, err := ioutil.TempFile(os.TempDir(), "unixfs-add-real")
+	rf, err := os.CreateTemp(os.TempDir(), "unixfs-add-real")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -134,7 +133,7 @@ func (tp *TestSuite) TestAdd(t *testing.T) {
 	defer os.Remove(rfp)
 
 	realFile := func() files.Node {
-		n, err := files.NewReaderPathFile(rfp, ioutil.NopCloser(strings.NewReader(helloStr)), stat)
+		n, err := files.NewReaderPathFile(rfp, io.NopCloser(strings.NewReader(helloStr)), stat)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -474,12 +473,12 @@ func (tp *TestSuite) TestAdd(t *testing.T) {
 					defer orig.Close()
 					defer got.Close()
 
-					do, err := ioutil.ReadAll(orig.(files.File))
+					do, err := io.ReadAll(orig.(files.File))
 					if err != nil {
 						t.Fatal(err)
 					}
 
-					dg, err := ioutil.ReadAll(got.(files.File))
+					dg, err := io.ReadAll(got.(files.File))
 					if err != nil {
 						t.Fatal(err)
 					}
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 686c40298..c398b6722 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -2,11 +2,12 @@ package iface
 
 import (
 	"context"
+
 	"github.com/ipfs/interface-go-ipfs-core/options"
 	path "github.com/ipfs/interface-go-ipfs-core/path"
 
 	"github.com/ipfs/go-cid"
-	"github.com/ipfs/go-ipfs-files"
+	files "github.com/ipfs/go-ipfs-files"
 )
 
 type AddEvent struct {