diff --git a/commands/run_command.go b/commands/run_command.go
index eb4d5ae..9abc2d7 100644
--- a/commands/run_command.go
+++ b/commands/run_command.go
@@ -78,26 +78,25 @@ type RunCommandArgs struct {
 	Host string `json:"host"`
 }
 
-func run_command_args() RunCommandArgs {
+func (rca *RunCommandArgs) ReadArgs() {
 
 	if len(os.Args) != 6 {
 		fmt.Fprintf(os.Stderr, "Usage: %s run_command <remote-command> <private-key> <username> <host>\n", os.Args[0])
 		os.Exit(1)
 	}
 
-	return RunCommandArgs{
-		os.Args[1],
-		os.Args[2],
-		os.Args[3],
-		os.Args[4],
-		os.Args[5],
-	}
+	rca.Command = os.Args[1]
+	rca.RemoteCommand = os.Args[2]
+	rca.PrivateKeyFile = os.Args[3]
+	rca.Username = os.Args[4]
+	rca.Host = os.Args[5]
 
 }
 
 func RunCommand() {
 
-	args := run_command_args()
+	args := RunCommandArgs{} 
+	args.ReadArgs()
 
 	client := GetClient(args.PrivateKeyFile, args.Username, args.Host)
 	defer client.Close()