diff --git a/config.py b/config.py
index 755f9db..7e8254f 100644
--- a/config.py
+++ b/config.py
@@ -2,27 +2,37 @@ import os
 from os import getenv
 from dotenv import load_dotenv
 
-load_dotenv()
 admins = {}
-SESSION_NAME = getenv("SESSION_NAME", "session")
-BOT_TOKEN = getenv("BOT_TOKEN")
-BOT_NAME = getenv("BOT_NAME")
+load_dotenv()
+
+# client vars
 API_ID = int(getenv("API_ID"))
 API_HASH = getenv("API_HASH")
-MONGODB_URL = getenv("MONGODB_URL")
+BOT_TOKEN = getenv("BOT_TOKEN")
+SESSION_NAME = getenv("SESSION_NAME", "session")
+
+# mandatory vars
+BOT_NAME = getenv("BOT_NAME")
 OWNER_NAME = getenv("OWNER_NAME")
 ALIVE_NAME = getenv("ALIVE_NAME")
 BOT_USERNAME = getenv("BOT_USERNAME")
 ASSISTANT_NAME = getenv("ASSISTANT_NAME")
+UPSTREAM_REPO = getenv("UPSTREAM_REPO")
+UPSTREAM_BRANCH = getenv("UPSTREAM_BRANCH", "main")
+DURATION_LIMIT = int(getenv("DURATION_LIMIT", "60"))
 GROUP_SUPPORT = getenv("GROUP_SUPPORT", "VeezSupportGroup")
 UPDATES_CHANNEL = getenv("UPDATES_CHANNEL", "levinachannel")
-SUDO_USERS = list(map(int, getenv("SUDO_USERS", "1757169682", "1738637033", "1448474573", "859229457").split()))
+
+# database, decorators, handlers mandatory vars
+MONGODB_URL = getenv("MONGODB_URL")
 COMMAND_PREFIXES = list(getenv("COMMAND_PREFIXES", "/ ! .").split())
-ALIVE_IMG = getenv("ALIVE_IMG", "https://telegra.ph/file/c83b000f004f01897fe18.png")
-DURATION_LIMIT = int(getenv("DURATION_LIMIT", "60"))
-UPSTREAM_REPO = getenv("UPSTREAM_REPO")
+OWNER_ID = list(map(int, getenv("OWNER_ID", "1757169682", "859229457").split()))
+SUDO_USERS = list(map(int, getenv("SUDO_USERS", "1757169682", "1738637033", "1448474573", "859229457").split()))
+
+# image resources vars
 IMG_1 = getenv("IMG_1", "https://telegra.ph/file/d6f92c979ad96b2031cba.png")
 IMG_2 = getenv("IMG_2", "https://telegra.ph/file/6213d2673486beca02967.png")
 IMG_3 = getenv("IMG_3", "https://telegra.ph/file/f02efde766160d3ff52d6.png")
 IMG_4 = getenv("IMG_4", "https://telegra.ph/file/be5f551acb116292d15ec.png")
 IMG_5 = getenv("IMG_5", "https://telegra.ph/file/63300139d232dc12452ab.png")
+ALIVE_IMG = getenv("ALIVE_IMG", "https://telegra.ph/file/c83b000f004f01897fe18.png")