diff --git a/src/main/java/com/university/chat/Client/chatClient.java b/src/main/java/com/university/chat/Client/chatClient.java
index 226842f..762e069 100644
--- a/src/main/java/com/university/chat/Client/chatClient.java
+++ b/src/main/java/com/university/chat/Client/chatClient.java
@@ -12,7 +12,7 @@ import java.nio.file.Paths;
 import java.util.Scanner;
 
 public class chatClient {
-    public static void main() {
+    public static void main(String[] args) {
 
         String host = "localhost";
         int port = 9000;
@@ -54,7 +54,7 @@ public class chatClient {
                             System.out.println("Usage: /msg <user> <text>");
                             continue;
                         }
-                        String target  = parts[1];
+                        String target = parts[1];
                         String text = parts[2];
                         out.writeObject(new ChatMessage(MessageType.PRIVATE_MESSAGE, username, target, text));
                         out.flush();
diff --git a/src/main/java/com/university/chat/Server/ClientSession.java b/src/main/java/com/university/chat/Server/ClientSession.java
index 3f0936c..5256563 100644
--- a/src/main/java/com/university/chat/Server/ClientSession.java
+++ b/src/main/java/com/university/chat/Server/ClientSession.java
@@ -91,7 +91,7 @@ public class ClientSession implements Runnable {
             }
             case PRIVATE_MESSAGE -> {
 
-                ClientSession receiver = userManager.getUser(msg.getSender());
+                ClientSession receiver = userManager.getUser(msg.getReceiver());
                 if (receiver != null) {
                     receiver.sendMessage(msg);
                 }
@@ -107,7 +107,7 @@ public class ClientSession implements Runnable {
     }
 
     private void handleFileMessage(FileMessage fileMsg) throws IOException {
-        // Storing the file
+
         var sentPath = FileManager.getSentPath(fileMsg.getSender(), fileMsg.getFilename());
         var recvPath = FileManager.getReceivedPath(fileMsg.getReceiver(), fileMsg.getFilename());