diff --git a/internal/auth0/quickstart.go b/internal/auth0/quickstart.go
index abd121de7..d5d952d50 100644
--- a/internal/auth0/quickstart.go
+++ b/internal/auth0/quickstart.go
@@ -130,7 +130,7 @@ func (q Quickstarts) FindByStack(stack string) (Quickstart, error) {
 		}
 	}
 
-	return Quickstart{}, fmt.Errorf("failed to find any quickstarts by stack: %q", stack)
+	return Quickstart{}, fmt.Errorf("failed to find any quickstarts for stack: %q", stack)
 }
 
 func (q Quickstarts) FilterByType(qsType string) (Quickstarts, error) {
@@ -142,7 +142,7 @@ func (q Quickstarts) FilterByType(qsType string) (Quickstarts, error) {
 	}
 
 	if len(filteredQuickstarts) == 0 {
-		return nil, fmt.Errorf("failed to find any quickstarts by type: %q", qsType)
+		return nil, fmt.Errorf("failed to find any quickstarts for type: %q", qsType)
 	}
 
 	return filteredQuickstarts, nil
diff --git a/internal/auth0/quickstarts_test.go b/internal/auth0/quickstarts_test.go
index 39ba14577..0fe3f2489 100644
--- a/internal/auth0/quickstarts_test.go
+++ b/internal/auth0/quickstarts_test.go
@@ -43,7 +43,7 @@ func TestFilterByType(t *testing.T) {
 		res, err := mockQuickStarts.FilterByType("some-unknown-type")
 		assert.Nil(t, res)
 		assert.Error(t, err)
-		assert.Equal(t, fmt.Sprintf("failed to find any quickstarts by type: %q", "some-unknown-type"), err.Error())
+		assert.Equal(t, fmt.Sprintf("failed to find any quickstarts for type: %q", "some-unknown-type"), err.Error())
 	})
 }
 
@@ -68,6 +68,6 @@ func TestFindByStack(t *testing.T) {
 		res, err := mockQuickStarts.FindByStack("some-non-existent-qs-type")
 		assert.Error(t, err)
 		assert.Empty(t, res)
-		assert.Equal(t, fmt.Sprintf("failed to find any quickstarts by stack: %q", "some-non-existent-qs-type"), err.Error())
+		assert.Equal(t, fmt.Sprintf("failed to find any quickstarts for stack: %q", "some-non-existent-qs-type"), err.Error())
 	})
 }
diff --git a/internal/cli/log_streams.go b/internal/cli/log_streams.go
index 08e7ea8f5..b8347e7e2 100644
--- a/internal/cli/log_streams.go
+++ b/internal/cli/log_streams.go
@@ -297,7 +297,7 @@ func (c *cli) logStreamPickerOptionsByType(desiredType logStreamType) pickerOpti
 		}
 		if len(options) == 0 {
 			return nil, fmt.Errorf(
-				"there are currently no log streams of type: %q, use 'auth0 logs streams create %s' to create one",
+				"there are currently no log streams of type: %q, use `auth0 logs streams create %s` to create one",
 				desiredType,
 				desiredType,
 			)
diff --git a/internal/cli/root.go b/internal/cli/root.go
index 9b4987711..bdb86cde0 100644
--- a/internal/cli/root.go
+++ b/internal/cli/root.go
@@ -58,7 +58,7 @@ func Execute() {
 
 	// Platform specific terminal initialization:
 	// this should run for all commands,
-	// for most of the architectures there's no requirements:.
+	// for most of the architectures there's no requirements.
 	ansi.InitConsole()
 
 	cancelCtx := contextWithCancel()
@@ -149,7 +149,7 @@ func addPersistentFlags(rootCmd *cobra.Command, cli *cli) {
 func addSubCommands(rootCmd *cobra.Command, cli *cli) {
 	// The order of the commands here matters.
 	// Add new commands in a place that reflect its
-	// relevance or relation with other commands:.
+	// relevance or relation with other commands.
 	rootCmd.AddCommand(loginCmd(cli))
 	rootCmd.AddCommand(logoutCmd(cli))
 	rootCmd.AddCommand(tenantsCmd(cli))
@@ -170,7 +170,7 @@ func addSubCommands(rootCmd *cobra.Command, cli *cli) {
 	rootCmd.AddCommand(apiCmd(cli))
 	rootCmd.AddCommand(terraformCmd(cli))
 
-	// Keep completion at the bottom:.
+	// Keep completion at the bottom.
 	rootCmd.AddCommand(completionCmd(cli))
 }
 
diff --git a/internal/cli/terraform_test.go b/internal/cli/terraform_test.go
index 1f15944aa..c55f37b9b 100644
--- a/internal/cli/terraform_test.go
+++ b/internal/cli/terraform_test.go
@@ -174,7 +174,7 @@ func setupTestDIRAndImportData(t *testing.T) (string, importDataList) {
 			ImportID:     "actionID_1",
 		},
 		{
-			ResourceName: "auth0_action.MyTestAction", //NOTE: duplicate name.
+			ResourceName: "auth0_action.MyTestAction", // NOTE: duplicate name.
 			ImportID:     "actionID_2",
 		},
 	}