diff --git a/main.go b/main.go
index 7bfdb6b..68b9de3 100644
--- a/main.go
+++ b/main.go
@@ -258,10 +258,10 @@ func (c *KVSClient) handlePut(args []string) {
 		jsonStr = strings.Join(args[1:], " ")
 	}
 
-	// Parse JSON data
+    // Parse JSON data
 	var data json.RawMessage
-	if err := json.Unmarshal([]byte(args[1]), &data); err != nil {
-		printJSONError(args[1], err)
+	if err := json.Unmarshal([]byte(jsonStr), &data); err != nil {
+		printJSONError(jsonStr, err)
 		return
 	}
 
@@ -571,6 +571,7 @@ func (c *KVSClient) handleUserCreate(args []string) {
 
 	fmt.Println(green("User created successfully"))
 	fmt.Println(cyan("UUID:"), response.UUID)
+}
 
 // printJSONError displays a user-friendly JSON parsing error with helpful hints
 func printJSONError(input string, err error) {
@@ -793,9 +794,6 @@ func parseCommand(line string) []string {
 		default:
 			current.WriteRune(ch)
 		}
-
-		// Add all other characters (including quotes inside unquoted args)
-		current.WriteByte(ch)
 	}
 
 	// Add the last part if it exists