4 files changed, 18 insertions, 28 deletions
diff --git a/internal/cli/description_sync.go b/internal/cli/description_sync.go
index 317bcdf..6a83c1e 100644
--- a/internal/cli/description_sync.go
+++ b/internal/cli/description_sync.go
@@ -24,12 +24,10 @@ func syncRepoDescriptions(cfg *config.Config, dryRun bool, repoName, knownCBDesc
 	var ghClient *github.Client
 	var cbClient *codeberg.Client
 	if ghOrg != nil {
-		c := github.NewClient(ghOrg.GitHubToken, ghOrg.Name)
-		ghClient = &c
+		ghClient = github.NewClient(ghOrg.GitHubToken, ghOrg.Name)
 	}
 	if cbOrg != nil {
-		c := codeberg.NewClient(cbOrg.Name, cbOrg.CodebergToken)
-		cbClient = &c
+		cbClient = codeberg.NewClient(cbOrg.CodebergToken, cbOrg.Name)
 	}
 
 	// Get current descriptions (use known if provided)
diff --git a/internal/cli/forge_client.go b/internal/cli/forge_client.go
index 690a6c8..d602803 100644
--- a/internal/cli/forge_client.go
+++ b/internal/cli/forge_client.go
@@ -11,10 +11,10 @@ func newRepoClientForOrg(org config.Organization) (forge.RepoClient, bool) {
 	switch org.Host {
 	case "git@github.com":
 		client := github.NewClient(org.GitHubToken, org.Name)
-		return &client, true
+		return client, true
 	case "git@codeberg.org":
-		client := codeberg.NewClient(org.Name, org.CodebergToken)
-		return &client, true
+		client := codeberg.NewClient(org.CodebergToken, org.Name)
+		return client, true
 	default:
 		return nil, false
 	}
diff --git a/internal/cli/showcase_only_handler.go b/internal/cli/showcase_only_handler.go
index 1a2a835..b836a27 100644
--- a/internal/cli/showcase_only_handler.go
+++ b/internal/cli/showcase_only_handler.go
@@ -96,7 +96,7 @@ func getAllRepositories(cfg *config.Config) ([]string, error) {
 	// Add Codeberg public repos if configured
 	if codebergOrg := cfg.FindCodebergOrg(); codebergOrg != nil {
 		fmt.Printf("Fetching public repositories from Codeberg user/org: %s...\n", codebergOrg.Name)
-		client := codeberg.NewClient(codebergOrg.Name, codebergOrg.CodebergToken)
+		client := codeberg.NewClient(codebergOrg.CodebergToken, codebergOrg.Name)
 
 		repos, err := client.ListPublicRepos()
 		if err != nil {
diff --git a/internal/cli/sync_handlers.go b/internal/cli/sync_handlers.go
index e791b45..1854b8e 100644
--- a/internal/cli/sync_handlers.go
+++ b/internal/cli/sync_handlers.go
@@ -95,23 +95,15 @@ func HandleSyncAll(cfg *config.Config, flags *Flags) int {
 	}
 
 	// Initialize GitHub client if needed
-	var githubClient github.Client
-	var hasGithubClient bool
+	var githubClient *github.Client
 	if flags.CreateGitHubRepos {
-		if client := initGitHubClient(cfg); client != nil {
-			githubClient = *client
-			hasGithubClient = true
-		}
+		githubClient = initGitHubClient(cfg)
 	}
 
 	// Initialize Codeberg client if needed
-	var codebergClient codeberg.Client
-	var hasCodebergClient bool
+	var codebergClient *codeberg.Client
 	if flags.CreateCodebergRepos {
-		if client := initCodebergClient(cfg); client != nil {
-			codebergClient = *client
-			hasCodebergClient = true
-		}
+		codebergClient = initCodebergClient(cfg)
 	}
 
 	syncer := sync.New(cfg, flags.WorkDir)
@@ -138,8 +130,8 @@ func HandleSyncAll(cfg *config.Config, flags *Flags) int {
 		}
 
 		// Create GitHub repo if needed
-		if hasGithubClient {
-			if err := createRepoWithClient(&githubClient, repo, fmt.Sprintf("Mirror of %s", repo)); err != nil {
+		if githubClient != nil {
+			if err := createRepoWithClient(githubClient, repo, fmt.Sprintf("Mirror of %s", repo)); err != nil {
 				fmt.Printf("ERROR: Failed to create GitHub repo %s: %v\n", repo, err)
 				fmt.Printf("Stopping sync due to error.\n")
 				return 1
@@ -147,7 +139,7 @@ func HandleSyncAll(cfg *config.Config, flags *Flags) int {
 		}
 
 		// Create Codeberg repo if needed
-		if hasCodebergClient {
+		if codebergClient != nil {
 			fmt.Printf("Checking/creating Codeberg repository %s...\n", repo)
 			if err := codebergClient.CreateRepo(repo, fmt.Sprintf("Mirror of %s", repo), false); err != nil {
 				fmt.Printf("Warning: Failed to create Codeberg repo %s: %v\n", repo, err)
@@ -196,7 +188,7 @@ func HandleSyncCodebergPublic(cfg *config.Config, flags *Flags) int {
 
 	fmt.Printf("Fetching public repositories from Codeberg user/org: %s...\n", codebergOrg.Name)
 
-	client := codeberg.NewClient(codebergOrg.Name, codebergOrg.CodebergToken)
+	client := codeberg.NewClient(codebergOrg.CodebergToken, codebergOrg.Name)
 
 	// Try fetching as organization first, then as user
 	repos, err := client.ListPublicRepos()
@@ -324,7 +316,7 @@ func createCodebergRepoIfNeeded(cfg *config.Config, repoName string) error {
 	}
 
 	fmt.Printf("Initializing Codeberg client for organization: %s\n", codebergOrg.Name)
-	codebergClient := codeberg.NewClient(codebergOrg.Name, codebergOrg.CodebergToken)
+	codebergClient := codeberg.NewClient(codebergOrg.CodebergToken, codebergOrg.Name)
 	if !codebergClient.HasToken() {
 		fmt.Println("Warning: No Codeberg token found. Cannot create repository.")
 		return nil
@@ -349,7 +341,7 @@ func initGitHubClient(cfg *config.Config) *github.Client {
 	}
 
 	fmt.Println("GitHub client initialized successfully with token")
-	return &githubClient
+	return githubClient
 }
 
 func createRepoWithClient(client *github.Client, repoName, description string) error {
@@ -365,14 +357,14 @@ func initCodebergClient(cfg *config.Config) *codeberg.Client {
 	}
 
 	fmt.Printf("Initializing Codeberg client for organization: %s\n", codebergOrg.Name)
-	codebergClient := codeberg.NewClient(codebergOrg.Name, codebergOrg.CodebergToken)
+	codebergClient := codeberg.NewClient(codebergOrg.CodebergToken, codebergOrg.Name)
 	if !codebergClient.HasToken() {
 		fmt.Println("Warning: No Codeberg token found. Cannot create repositories.")
 		return nil
 	}
 
 	fmt.Println("Codeberg client initialized successfully with token")
-	return &codebergClient
+	return codebergClient
 }
 
 func showReposToSync(repoNames []string) {