diff --git a/Makefile b/Makefile
index d50588b..6ebf7c0 100644
--- a/Makefile
+++ b/Makefile
@@ -44,6 +44,10 @@ clean:
 test:
 	$(GO) test -v ./...
 
+.PHONY: format
+format:
+	$(GO) run golang.org/x/tools/cmd/goimports@latest -d -w -local $(shell $(GO) list -m) .
+
 .PHONY: lint
 lint: lint-golangci lint-nilaway
 
diff --git a/internal/client/client.go b/internal/client/client.go
index 3941e26..0033976 100644
--- a/internal/client/client.go
+++ b/internal/client/client.go
@@ -5,9 +5,10 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/replicate/replicate-go"
+
 	"github.com/replicate/cli/internal"
 	"github.com/replicate/cli/internal/config"
-	"github.com/replicate/replicate-go"
 )
 
 func NewClient(opts ...replicate.ClientOption) (*replicate.Client, error) {
diff --git a/internal/cmd/auth/login.go b/internal/cmd/auth/login.go
index f19e447..e795371 100644
--- a/internal/cmd/auth/login.go
+++ b/internal/cmd/auth/login.go
@@ -6,9 +6,10 @@ import (
 	"os"
 	"strings"
 
+	"github.com/spf13/cobra"
+
 	"github.com/replicate/cli/internal/client"
 	"github.com/replicate/cli/internal/config"
-	"github.com/spf13/cobra"
 )
 
 // loginCmd represents the login command
diff --git a/internal/cmd/model/create.go b/internal/cmd/model/create.go
index 657f12a..1e7dde9 100644
--- a/internal/cmd/model/create.go
+++ b/internal/cmd/model/create.go
@@ -4,11 +4,12 @@ import (
 	"fmt"
 
 	"github.com/cli/browser"
+	"github.com/replicate/replicate-go"
+	"github.com/spf13/cobra"
+
 	"github.com/replicate/cli/internal/client"
 	"github.com/replicate/cli/internal/identifier"
 	"github.com/replicate/cli/internal/util"
-	"github.com/replicate/replicate-go"
-	"github.com/spf13/cobra"
 )
 
 // createCmd represents the create command
diff --git a/internal/cmd/model/list.go b/internal/cmd/model/list.go
index 7f534f5..eb0bc9e 100644
--- a/internal/cmd/model/list.go
+++ b/internal/cmd/model/list.go
@@ -5,9 +5,10 @@ import (
 	"fmt"
 	"os/exec"
 
+	"github.com/spf13/cobra"
+
 	"github.com/replicate/cli/internal/client"
 	"github.com/replicate/cli/internal/util"
-	"github.com/spf13/cobra"
 
 	"github.com/charmbracelet/bubbles/table"
 	tea "github.com/charmbracelet/bubbletea"
diff --git a/internal/cmd/model/show.go b/internal/cmd/model/show.go
index 3d596eb..0a27f36 100644
--- a/internal/cmd/model/show.go
+++ b/internal/cmd/model/show.go
@@ -5,11 +5,12 @@ import (
 	"fmt"
 
 	"github.com/cli/browser"
+	"github.com/replicate/replicate-go"
+	"github.com/spf13/cobra"
+
 	"github.com/replicate/cli/internal/client"
 	"github.com/replicate/cli/internal/identifier"
 	"github.com/replicate/cli/internal/util"
-	"github.com/replicate/replicate-go"
-	"github.com/spf13/cobra"
 )
 
 var showCmd = &cobra.Command{
diff --git a/internal/cmd/prediction/create.go b/internal/cmd/prediction/create.go
index d0ab4c1..52b6d1b 100644
--- a/internal/cmd/prediction/create.go
+++ b/internal/cmd/prediction/create.go
@@ -11,12 +11,13 @@ import (
 	"github.com/briandowns/spinner"
 	"github.com/cli/browser"
 	"github.com/getkin/kin-openapi/openapi3"
-	"github.com/replicate/cli/internal/client"
-	"github.com/replicate/cli/internal/identifier"
-	"github.com/replicate/cli/internal/util"
 	"github.com/replicate/replicate-go"
 	"github.com/schollz/progressbar/v3"
 	"github.com/spf13/cobra"
+
+	"github.com/replicate/cli/internal/client"
+	"github.com/replicate/cli/internal/identifier"
+	"github.com/replicate/cli/internal/util"
 )
 
 var CreateCmd = &cobra.Command{
diff --git a/internal/cmd/prediction/list.go b/internal/cmd/prediction/list.go
index 820f6a8..62d9941 100644
--- a/internal/cmd/prediction/list.go
+++ b/internal/cmd/prediction/list.go
@@ -5,9 +5,10 @@ import (
 	"fmt"
 	"os/exec"
 
+	"github.com/spf13/cobra"
+
 	"github.com/replicate/cli/internal/client"
 	"github.com/replicate/cli/internal/util"
-	"github.com/spf13/cobra"
 
 	"github.com/charmbracelet/bubbles/table"
 	tea "github.com/charmbracelet/bubbletea"
diff --git a/internal/cmd/prediction/show.go b/internal/cmd/prediction/show.go
index 450bb82..4189e7b 100644
--- a/internal/cmd/prediction/show.go
+++ b/internal/cmd/prediction/show.go
@@ -5,9 +5,10 @@ import (
 	"fmt"
 
 	"github.com/cli/browser"
+	"github.com/spf13/cobra"
+
 	"github.com/replicate/cli/internal/client"
 	"github.com/replicate/cli/internal/util"
-	"github.com/spf13/cobra"
 )
 
 var showCmd = &cobra.Command{
diff --git a/internal/cmd/training/create.go b/internal/cmd/training/create.go
index 0bbffbd..cb1b904 100644
--- a/internal/cmd/training/create.go
+++ b/internal/cmd/training/create.go
@@ -7,11 +7,12 @@ import (
 
 	"github.com/briandowns/spinner"
 	"github.com/cli/browser"
+	"github.com/replicate/replicate-go"
+	"github.com/spf13/cobra"
+
 	"github.com/replicate/cli/internal/client"
 	"github.com/replicate/cli/internal/identifier"
 	"github.com/replicate/cli/internal/util"
-	"github.com/replicate/replicate-go"
-	"github.com/spf13/cobra"
 )
 
 // CreateCmd represents the create command
diff --git a/internal/cmd/training/list.go b/internal/cmd/training/list.go
index 34efe32..cf6565d 100644
--- a/internal/cmd/training/list.go
+++ b/internal/cmd/training/list.go
@@ -4,9 +4,10 @@ import (
 	"fmt"
 	"os/exec"
 
+	"github.com/spf13/cobra"
+
 	"github.com/replicate/cli/internal/client"
 	"github.com/replicate/cli/internal/util"
-	"github.com/spf13/cobra"
 
 	"github.com/charmbracelet/bubbles/table"
 	tea "github.com/charmbracelet/bubbletea"
diff --git a/internal/cmd/training/show.go b/internal/cmd/training/show.go
index 9e0c655..c97d953 100644
--- a/internal/cmd/training/show.go
+++ b/internal/cmd/training/show.go
@@ -5,9 +5,10 @@ import (
 	"fmt"
 
 	"github.com/cli/browser"
+	"github.com/spf13/cobra"
+
 	"github.com/replicate/cli/internal/client"
 	"github.com/replicate/cli/internal/util"
-	"github.com/spf13/cobra"
 )
 
 var showCmd = &cobra.Command{
diff --git a/internal/util/util_test.go b/internal/util/util_test.go
index 2432346..4ab3642 100644
--- a/internal/util/util_test.go
+++ b/internal/util/util_test.go
@@ -11,9 +11,10 @@ import (
 	"testing"
 
 	"github.com/getkin/kin-openapi/openapi3"
-	"github.com/replicate/cli/internal/util"
 	"github.com/replicate/replicate-go"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/replicate/cli/internal/util"
 )
 
 func TestParseInputs(t *testing.T) {