diff --git a/internal/downloadManager/download.go b/internal/downloadManager/download.go
index 42ac51ff1..dfc4b275d 100644
--- a/internal/downloadManager/download.go
+++ b/internal/downloadManager/download.go
@@ -4,10 +4,12 @@ import (
 	"archive/tar"
 	"archive/zip"
 	"compress/gzip"
+	"errors"
 	"fmt"
 	"github.com/kubefirst/kubefirst/configs"
 	"github.com/kubefirst/kubefirst/pkg"
 	"io"
+	"io/fs"
 	"log"
 	"net/http"
 	"os"
@@ -17,22 +19,24 @@ import (
 
 func DownloadTools(config *configs.Config, trackers map[string]*pkg.ActionTracker) error {
 
-	toolsDir := fmt.Sprintf("%s/tools", config.K1FolderPath)
+	toolsDirPath := fmt.Sprintf("%s/tools", config.K1FolderPath)
 
-	err := os.Mkdir(toolsDir, 0777)
-	if err != nil {
-		log.Printf("error creating directory %s, error is: %s\n", toolsDir, err)
+	// create folder if it doesn't exist
+	if _, err := os.Stat(toolsDirPath); errors.Is(err, fs.ErrNotExist) {
+		err = os.Mkdir(toolsDirPath, 0777)
+		if err != nil {
+			return err
+		}
 	}
 
-	kubectlVersion := config.KubectlVersion
 	kubectlDownloadUrl := fmt.Sprintf(
 		"https://dl.k8s.io/release/%s/bin/%s/%s/kubectl",
-		kubectlVersion,
+		config.KubectlVersion,
 		config.LocalOs,
 		config.LocalArchitecture,
 	)
 
-	err = downloadFile(config.KubectlClientPath, kubectlDownloadUrl)
+	err := downloadFile(config.KubectlClientPath, kubectlDownloadUrl)
 	if err != nil {
 		return err
 	}
@@ -86,7 +90,7 @@ func DownloadTools(config *configs.Config, trackers map[string]*pkg.ActionTracke
 	if err != nil {
 		return err
 	}
-	os.RemoveAll(fmt.Sprintf("%s/terraform.zip", toolsDir))
+	os.RemoveAll(fmt.Sprintf("%s/terraform.zip", toolsDirPath))
 
 	trackers[pkg.DownloadDependencies].Tracker.Increment(int64(1))
 
@@ -136,27 +140,28 @@ func DownloadTools(config *configs.Config, trackers map[string]*pkg.ActionTracke
 	return nil
 }
 
-func downloadFile(filepath string, url string) (err error) {
-	// Create the file
-	out, err := os.Create(filepath)
+// downloadFile Downloads a file from the "url" parameter, localFilename is the file destination in the local machine.
+func downloadFile(localFilename string, url string) error {
+	// create local file
+	out, err := os.Create(localFilename)
 	if err != nil {
 		return err
 	}
 	defer out.Close()
 
-	// Get the data
+	// get data
 	resp, err := http.Get(url)
 	if err != nil {
 		return err
 	}
 	defer resp.Body.Close()
 
-	// Check server response
+	// check server response
 	if resp.StatusCode != http.StatusOK {
 		return fmt.Errorf("bad status: %s", resp.Status)
 	}
 
-	// Writer the body to file
+	// writer the body to the file
 	_, err = io.Copy(out, resp.Body)
 	if err != nil {
 		return err
@@ -204,52 +209,6 @@ func extractFileFromTarGz(gzipStream io.Reader, tarAddress string, targetFilePat
 	}
 }
 
-func extractTarGz(gzipStream io.Reader) {
-	uncompressedStream, err := gzip.NewReader(gzipStream)
-	if err != nil {
-		log.Fatal("extractTarGz: NewReader failed")
-	}
-
-	tarReader := tar.NewReader(uncompressedStream)
-
-	for {
-		header, err := tarReader.Next()
-
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			log.Println("extractTarGz: Next() failed: %s", err.Error())
-		}
-		p, _ := filepath.Abs(header.Name)
-		if !strings.Contains(p, "..") {
-
-			switch header.Typeflag {
-			case tar.TypeDir:
-				if err := os.Mkdir(header.Name, 0755); err != nil {
-					log.Println("extractTarGz: Mkdir() failed: %s", err.Error())
-				}
-			case tar.TypeReg:
-				outFile, err := os.Create(header.Name)
-				if err != nil {
-					log.Println("extractTarGz: Create() failed: %s", err.Error())
-				}
-				if _, err := io.Copy(outFile, tarReader); err != nil {
-					log.Println("extractTarGz: Copy() failed: %s", err.Error())
-				}
-				outFile.Close()
-
-			default:
-				log.Println(
-					"extractTarGz: uknown type: %s in %s",
-					header.Typeflag,
-					header.Name)
-			}
-		}
-
-	}
-}
-
 func unzip(zipFilepath string, unzipDirectory string) {
 	dst := unzipDirectory
 	archive, err := zip.OpenReader(zipFilepath)
diff --git a/pkg/common.go b/pkg/common.go
index b0fc1c0fd..08ba21a22 100644
--- a/pkg/common.go
+++ b/pkg/common.go
@@ -1,6 +1,8 @@
 package pkg
 
-import "net/http"
+import (
+	"net/http"
+)
 
 type HTTPDoer interface {
 	Do(req *http.Request) (*http.Response, error)