diff --git a/src/main/resources/init.sql b/src/main/resources/init.sql
index 5297a06..359bfa5 100644
--- a/src/main/resources/init.sql
+++ b/src/main/resources/init.sql
@@ -1,5 +1,5 @@
 CREATE TABLE IF NOT EXISTS users(
-                                    user_id VARCHAR(70) UNIQUE,
+    user_id VARCHAR(70) UNIQUE,
     internal_uuid UUID PRIMARY KEY,
     username VARCHAR(50) UNIQUE NOT NULL,
     password TEXT NOT NULL,
@@ -12,7 +12,7 @@ CREATE TABLE IF NOT EXISTS users(
 
 
 CREATE TABLE IF NOT EXISTS contacts (
-                                        user_id UUID REFERENCES users(internal_uuid) ON DELETE CASCADE,
+    user_id UUID REFERENCES users(internal_uuid) ON DELETE CASCADE,
     contact_id UUID REFERENCES users(internal_uuid) ON DELETE CASCADE,
     added_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     is_blocked BOOLEAN DEFAULT FALSE,
@@ -21,74 +21,66 @@ CREATE TABLE IF NOT EXISTS contacts (
 
 
 CREATE TABLE IF NOT EXISTS messages (
-                                        message_id UUID PRIMARY KEY,
-                                        sender_id UUID REFERENCES users(internal_uuid) ON DELETE SET NULL,
+    message_id UUID PRIMARY KEY,
+    sender_id UUID REFERENCES users(internal_uuid) ON DELETE SET NULL,
     receiver_type VARCHAR(20) NOT NULL CHECK (receiver_type IN ('private','group','channel')),
-    receiver_id UUID NOT NULL,
+    receiver_id UUID NOT NULL ,
     content TEXT,
     message_type VARCHAR(20) DEFAULT 'TEXT' CHECK (message_type IN ('TEXT','IMAGE','FILE','VIDEO','AUDIO','STICKER','GIF')),
     file_url TEXT,                                                --(Bouns)
     send_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     status VARCHAR(20),                                      -- SEND,DELIVERED,READ
     reply_to_id UUID REFERENCES messages(message_id) ON DELETE SET NULL,        --(Bouns)
-    is_edited BOOLEAN,                                           --(Bonus)
-    original_message_id UUID REFERENCES message_id,              --(Bonus)
-    forwarded_by UUID REFERENCES users(internal_uuid),              --(Bouns)
-    forwarded_from UUID REFERENCES users(internal_uuid)              --(Bouns)
+    is_edited BOOLEAN DEFAULT FALSE,                                           --(Bonus)
+    original_message_id UUID REFERENCES messages(message_id)
+   ON DELETE SET NULL,              --(Bonus)
+    forwarded_by UUID REFERENCES users(internal_uuid) ON DELETE SET NULL,              --(Bouns)
+    forwarded_from UUID REFERENCES users(internal_uuid) ON DELETE SET NULL             --(Bouns)
     );
 
-
 CREATE TABLE IF NOT EXISTS private_chat (
-                                            chat_id UUID PRIMARY KEY,
-                                            user1-id UUID REFERENCES users(internal_uuid) ON DELETE SET NULL,
+     chat_id UUID PRIMARY KEY,
+    user1_id UUID REFERENCES users(internal_uuid) ON DELETE SET NULL,
     user2_id UUID REFERENCES users(internal_uuid) ON DELETE SET NULL,
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     CONSTRAINT unique_users UNIQUE (user1_id, user2_id)
     );
-
-
 CREATE TABLE IF NOT EXISTS groups (
-                                      group_id VARCHAR(70) UNIQUE,
-    internal_uuid UUID,
+    internal_uuid UUID PRIMARY KEY,
+    group_id VARCHAR(70) UNIQUE,
     group_name VARCHAR(100),
     creator_id UUID REFERENCES users(internal_uuid),
     image_url TEXT,
-    description TEXT,
-    PRIMARY KEY (group_id, internal_uuid)
-    );
-
+    description TEXT
+);
 
 CREATE TABLE IF NOT EXISTS group_members (
-                                             group_id UUID REFERENCES groups(group_id),
+    group_id UUID REFERENCES groups(internal_uuid) ON DELETE CASCADE,
     user_id UUID REFERENCES users(internal_uuid),
     joined_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     role VARCHAR(20) DEFAULT 'member',                  -- member/admin/owner
     PRIMARY KEY (group_id, user_id)
     );
-
-
 CREATE TABLE IF NOT EXISTS channels (
-                                        channel_id VARCHAR(70) UNIQUE,
-    internal_uuid UUID,
+    channel_id VARCHAR(70) UNIQUE,
+    internal_uuid UUID PRIMARY KEY,,
     channel_name VARCHAR(100),
     creator_id UUID REFERENCES users(internal_uuid),
     image_url TEXT,
-    description TEXT,
-    PRIMARY KEY (channel_id, internal_uuid)
+    description TEXT
+    
     );
 
-
 CREATE TABLE IF NOT EXISTS channel_subscribers (
-                                                   channel_id UUID REFERENCES channels(channel_id),
+     channel_id UUID REFERENCES channels(internal_uuid) ON DELETE CASCADE,
     user_id UUID REFERENCES users(internal_uuid),
     subscribed_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     PRIMARY KEY (channel_id, user_id)
     );
 
-
 --(Bouns)
 CREATE TABLE IF NOT EXISTS channel_admins (
-                                              channel_id UUID REFERENCES channels(channel_id),
+    channel_id UUID REFERENCES channels(channel_id),
     user_id UUID REFERENCES users(internal_uuid),
     added_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     added_by UUID REFERENCES users(internal_uuid),
@@ -99,4 +91,4 @@ CREATE TABLE IF NOT EXISTS channel_admins (
     can_delete_members BOOLEAN DEFAULT FALSE,
     can_add_members BOOLEAN DEFAULT TRUE,
     PRIMARY KEY (channel_id, user_id)
-    );
\ No newline at end of file
+    );