diff --git a/cmd/create.go b/cmd/create.go
index 1adfa78..5fdcb8d 100644
--- a/cmd/create.go
+++ b/cmd/create.go
@@ -18,7 +18,7 @@ var createCmd = &cobra.Command{
 
 func init() {
 	rootCmd.AddCommand(createCmd)
-    createCmd.PersistentFlags().BoolP("json", "j", false, "Outputs JSON")
+	createCmd.PersistentFlags().BoolP("json", "j", false, "Outputs JSON")
 	createCmd.AddCommand(resource.ResourceCreateCmd)
 	createCmd.AddCommand(folder.FolderCreateCmd)
 	createCmd.AddCommand(group.GroupCreateCmd)
diff --git a/cmd/get.go b/cmd/get.go
index e3f814a..4835304 100644
--- a/cmd/get.go
+++ b/cmd/get.go
@@ -18,7 +18,7 @@ var getCmd = &cobra.Command{
 
 func init() {
 	rootCmd.AddCommand(getCmd)
-    getCmd.PersistentFlags().BoolP("json", "j", false, "Outputs JSON")
+	getCmd.PersistentFlags().BoolP("json", "j", false, "Outputs JSON")
 	getCmd.AddCommand(resource.ResourceGetCmd)
 	getCmd.AddCommand(folder.FolderGetCmd)
 	getCmd.AddCommand(group.GroupGetCmd)
diff --git a/cmd/list.go b/cmd/list.go
index a3044dd..49fa0a1 100644
--- a/cmd/list.go
+++ b/cmd/list.go
@@ -18,7 +18,7 @@ var listCmd = &cobra.Command{
 
 func init() {
 	rootCmd.AddCommand(listCmd)
-    listCmd.PersistentFlags().BoolP("json", "j", false, "Outputs JSON")
+	listCmd.PersistentFlags().BoolP("json", "j", false, "Outputs JSON")
 	listCmd.AddCommand(resource.ResourceListCmd)
 	listCmd.AddCommand(folder.FolderListCmd)
 	listCmd.AddCommand(group.GroupListCmd)
diff --git a/user/create.go b/user/create.go
index 5d13e0f..dff7dd4 100644
--- a/user/create.go
+++ b/user/create.go
@@ -2,7 +2,7 @@ package user
 
 import (
 	"context"
-    "encoding/json"
+	"encoding/json"
 	"fmt"
 
 	"github.com/passbolt/go-passbolt-cli/util"
@@ -46,10 +46,10 @@ func UserCreate(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-    jsonOutput, err := cmd.Flags().GetBool("json")
-    if err != nil {
-        return err
-    }
+	jsonOutput, err := cmd.Flags().GetBool("json")
+	if err != nil {
+		return err
+	}
 
 	ctx := util.GetContext()
 
@@ -63,28 +63,28 @@ func UserCreate(cmd *cobra.Command, args []string) error {
 	user, err := client.CreateUser(
 		ctx,
 		api.User{
-            Username: username,
-            Profile: &api.Profile{
-                FirstName: firstname,
-                LastName: lastname,
-            },
-            Role: &api.Role{
-                Name: role,
-            },
-        },
+			Username: username,
+			Profile: &api.Profile{
+				FirstName: firstname,
+				LastName:  lastname,
+			},
+			Role: &api.Role{
+				Name: role,
+			},
+		},
 	)
 	if err != nil {
 		return fmt.Errorf("Creating User: %w", err)
 	}
 
-    if jsonOutput {
-        jsonUser, err := json.MarshalIndent(user, "", "  ")
-        if err != nil {
-            return err
-        }
-        fmt.Println(string(jsonUser))
-    } else {
-	    fmt.Printf("UserID: %v\n", user.ID)
-    }
-    return nil
+	if jsonOutput {
+		jsonUser, err := json.MarshalIndent(user, "", "  ")
+		if err != nil {
+			return err
+		}
+		fmt.Println(string(jsonUser))
+	} else {
+		fmt.Printf("UserID: %v\n", user.ID)
+	}
+	return nil
 }
diff --git a/user/list.go b/user/list.go
index e6c72ad..8cd5e64 100644
--- a/user/list.go
+++ b/user/list.go
@@ -2,7 +2,7 @@ package user
 
 import (
 	"context"
-    "encoding/json"
+	"encoding/json"
 	"fmt"
 	"strings"
 
@@ -57,10 +57,10 @@ func UserList(cmd *cobra.Command, args []string) error {
 	if len(columns) == 0 {
 		return fmt.Errorf("You need to specify atleast one column to return")
 	}
-    jsonOutput, err := cmd.Flags().GetBool("json")
-    if err != nil {
-        return err
-    }
+	jsonOutput, err := cmd.Flags().GetBool("json")
+	if err != nil {
+		return err
+	}
 	ctx := util.GetContext()
 
 	client, err := util.GetClient(ctx)
@@ -80,38 +80,38 @@ func UserList(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("Listing User: %w", err)
 	}
 
-    if jsonOutput {
-        jsonUser, err := json.MarshalIndent(users, "", "  ")
-        if err != nil {
-            return err
-        }
-        fmt.Println(string(jsonUser))
-    } else {
-        data := pterm.TableData{columns}
+	if jsonOutput {
+		jsonUser, err := json.MarshalIndent(users, "", "  ")
+		if err != nil {
+			return err
+		}
+		fmt.Println(string(jsonUser))
+	} else {
+		data := pterm.TableData{columns}
 
-        for _, user := range users {
-            entry := make([]string, len(columns))
-            for i := range columns {
-                switch strings.ToLower(columns[i]) {
-                case "id":
-                    entry[i] = user.ID
-                case "username":
-                    entry[i] = shellescape.StripUnsafe(user.Username)
-                case "firstname":
-                    entry[i] = shellescape.StripUnsafe(user.Profile.FirstName)
-                case "lastname":
-                    entry[i] = shellescape.StripUnsafe(user.Profile.LastName)
-                case "role":
-                    entry[i] = shellescape.StripUnsafe(user.Role.Name)
-                default:
-                    cmd.SilenceUsage = false
-                    return fmt.Errorf("Unknown Column: %v", columns[i])
-                }
-            }
-            data = append(data, entry)
-        }
+		for _, user := range users {
+			entry := make([]string, len(columns))
+			for i := range columns {
+				switch strings.ToLower(columns[i]) {
+				case "id":
+					entry[i] = user.ID
+				case "username":
+					entry[i] = shellescape.StripUnsafe(user.Username)
+				case "firstname":
+					entry[i] = shellescape.StripUnsafe(user.Profile.FirstName)
+				case "lastname":
+					entry[i] = shellescape.StripUnsafe(user.Profile.LastName)
+				case "role":
+					entry[i] = shellescape.StripUnsafe(user.Role.Name)
+				default:
+					cmd.SilenceUsage = false
+					return fmt.Errorf("Unknown Column: %v", columns[i])
+				}
+			}
+			data = append(data, entry)
+		}
 
-        pterm.DefaultTable.WithHasHeader().WithData(data).Render()
-    }
-    return nil
+		pterm.DefaultTable.WithHasHeader().WithData(data).Render()
+	}
+	return nil
 }