diff --git a/squid3-install.sh b/squid3-install.sh
index 0d69588..22b9c44 100644
--- a/squid3-install.sh
+++ b/squid3-install.sh
@@ -2,7 +2,7 @@
 
 ############################################################
 # Squid Proxy Installer
-# Author: Yujin Boby
+# Author: Yujin Boby (Edited By: Sanjay Singh)
 # Email: admin@serverOk.in
 # Github: https://github.com/serverok/squid-proxy-installer/
 # Web: https://serverok.in/squid
@@ -10,212 +10,184 @@
 # https://serverok.in/contact
 ############################################################
 
-if [ `whoami` != root ]; then
-	echo "ERROR: You need to run the script as user root or add sudo before command."
-	exit 1
-fi
 
-/usr/bin/wget -q --no-check-certificate -O /usr/bin/sok-find-os https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/sok-find-os.sh > /dev/null 2>&1
-chmod 755 /usr/bin/sok-find-os
+checks(){
+    # Check or root access if available then pass
+    if [ `whoami` != root ]; then
+        echo "ERROR: You need to run the script as user root or add sudo before command."
+        exit 1
+    fi
 
-/usr/bin/wget -q --no-check-certificate -O /usr/bin/squid-uninstall https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/squid-uninstall.sh > /dev/null 2>&1
-chmod 755 /usr/bin/squid-uninstall
+    # Check for already install squid if not found pass
+    if [[ -d /etc/squid/ || -d /etc/squid3/ ]]; then
+        echo -e "\nSquid Proxy already installed.\n"
+        echo -e "If you want to reinstall, first uninstall squid proxy by running the following command:\n"
+        echo -e "sudo squid-uninstall\n"
+        exit 1
+    fi
 
-/usr/bin/wget -q --no-check-certificate -O /usr/bin/squid-add-user https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/squid-add-user.sh > /dev/null 2>&1
-chmod 755 /usr/bin/squid-add-user
+    # Check for operating system
+    if [ ! -f /usr/bin/sok-find-os ]; then
+        echo "/usr/bin/sok-find-os not found"
+        exit 1
+    fi
 
-if [[ -d /etc/squid/ || -d /etc/squid3/ ]]; then
-    echo -e "\nSquid Proxy already installed.\n"
-    echo -e "If you want to reinstall, first uninstall squid proxy by running the following command:\n"
-    echo -e "sudo squid-uninstall\n"
-    exit 1
-fi
+    SOK_OS=$(/usr/bin/sok-find-os)
 
-if [ ! -f /usr/bin/sok-find-os ]; then
-    echo "/usr/bin/sok-find-os not found"
-    exit 1
-fi
+    # If os not found just exit the script
+    if [ $SOK_OS == "ERROR" ]; then
+        cat /etc/*release
+        echo -e "\nOS NOT SUPPORTED.\n"
+        echo -e "Contact me on twitter/X (https://twitter.com/serverokin) to add support for your OS.\n"
+        exit 1;
+    fi
+}
 
-SOK_OS=$(/usr/bin/sok-find-os)
+install_command_script(){
+    /usr/bin/wget -q --no-check-certificate -O /usr/bin/sok-find-os https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/sok-find-os.sh > /dev/null 2>&1
+    chmod 755 /usr/bin/sok-find-os
 
-if [ $SOK_OS == "ERROR" ]; then
-    cat /etc/*release
-    echo -e "\nOS NOT SUPPORTED.\n"
-    echo -e "Contact me on twitter/X (https://twitter.com/serverokin) to add support for your OS.\n"
-    exit 1;
-fi
+    /usr/bin/wget -q --no-check-certificate -O /usr/bin/squid-uninstall https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/squid-uninstall.sh > /dev/null 2>&1
+    chmod 755 /usr/bin/squid-uninstall
 
-echo -e "Installing squid on ${SOK_OS}, please wait....\n"
+    /usr/bin/wget -q --no-check-certificate -O /usr/bin/squid-add-user https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/squid-add-user.sh > /dev/null 2>&1
+    chmod 755 /usr/bin/squid-add-user
 
-if [ $SOK_OS == "ubuntu2404" ]; then
-    /usr/bin/apt update > /dev/null 2>&1
-    /usr/bin/apt -y install apache2-utils squid > /dev/null 2>&1
-    touch /etc/squid/passwd
-    mv /etc/squid/squid.conf /etc/squid/squid.conf.bak
-    /usr/bin/touch /etc/squid/blacklist.acl
-    /usr/bin/wget -q --no-check-certificate -O /etc/squid/squid.conf https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/conf/ubuntu-2204.conf
-    if [ -f /sbin/iptables ]; then
-        /sbin/iptables -I INPUT -p tcp --dport 3128 -j ACCEPT
-    fi
-    systemctl enable squid  > /dev/null 2>&1
-    service squid restart
-elif [ $SOK_OS == "ubuntu2204" ]; then
-    /usr/bin/apt update > /dev/null 2>&1
-    /usr/bin/apt -y install apache2-utils squid > /dev/null 2>&1
-    touch /etc/squid/passwd
-    mv /etc/squid/squid.conf /etc/squid/squid.conf.bak
-    /usr/bin/touch /etc/squid/blacklist.acl
-    /usr/bin/wget -q --no-check-certificate -O /etc/squid/squid.conf https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/conf/ubuntu-2204.conf
-    if [ -f /sbin/iptables ]; then
-        /sbin/iptables -I INPUT -p tcp --dport 3128 -j ACCEPT
-    fi
-    service squid restart
-    systemctl enable squid
-elif [ $SOK_OS == "ubuntu2004" ]; then
-    /usr/bin/apt update > /dev/null 2>&1
-    /usr/bin/apt -y install apache2-utils squid > /dev/null 2>&1
-    touch /etc/squid/passwd
-    /bin/rm -f /etc/squid/squid.conf
-    /usr/bin/touch /etc/squid/blacklist.acl
-    /usr/bin/wget -q --no-check-certificate -O /etc/squid/squid.conf https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/squid.conf
-    if [ -f /sbin/iptables ]; then
-        /sbin/iptables -I INPUT -p tcp --dport 3128 -j ACCEPT
-    fi
-    service squid restart
-    systemctl enable squid
-elif [ $SOK_OS == "ubuntu1804" ]; then
-    /usr/bin/apt update > /dev/null 2>&1
-    /usr/bin/apt -y install apache2-utils squid3 > /dev/null 2>&1
-    touch /etc/squid/passwd
-    /bin/rm -f /etc/squid/squid.conf
-    /usr/bin/touch /etc/squid/blacklist.acl
-    /usr/bin/wget -q --no-check-certificate -O /etc/squid/squid.conf https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/squid.conf
-    /sbin/iptables -I INPUT -p tcp --dport 3128 -j ACCEPT
-    /sbin/iptables-save
-    service squid restart
-    systemctl enable squid
-elif [ $SOK_OS == "ubuntu1604" ]; then
-    /usr/bin/apt update > /dev/null 2>&1
-    /usr/bin/apt -y install apache2-utils squid3 > /dev/null 2>&1
-    touch /etc/squid/passwd
-    /bin/rm -f /etc/squid/squid.conf
-    /usr/bin/touch /etc/squid/blacklist.acl
-    /usr/bin/wget -q --no-check-certificate -O /etc/squid/squid.conf https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/squid.conf
-    /sbin/iptables -I INPUT -p tcp --dport 3128 -j ACCEPT
-    service squid restart
-    update-rc.d squid defaults
-elif [ $SOK_OS == "ubuntu1404" ]; then
-    /usr/bin/apt update > /dev/null 2>&1
-    /usr/bin/apt -y install apache2-utils squid3 > /dev/null 2>&1
-    touch /etc/squid3/passwd
-    /bin/rm -f /etc/squid3/squid.conf
-    /usr/bin/touch /etc/squid3/blacklist.acl
-    /usr/bin/wget -q --no-check-certificate -O /etc/squid3/squid.conf https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/squid.conf
-    /sbin/iptables -I INPUT -p tcp --dport 3128 -j ACCEPT
-    service squid3 restart
-    ln -s /etc/squid3 /etc/squid
-    #update-rc.d squid3 defaults
-    ln -s /etc/squid3 /etc/squid
-elif [ $SOK_OS == "debian8" ]; then
-    # OS = Debian 8
-    /bin/rm -rf /etc/squid
-    /usr/bin/apt update > /dev/null 2>&1
-    /usr/bin/apt -y install apache2-utils squid3 > /dev/null 2>&1
-    touch /etc/squid3/passwd
-    /bin/rm -f /etc/squid3/squid.conf
-    /usr/bin/touch /etc/squid3/blacklist.acl
-    /usr/bin/wget -q --no-check-certificate -O /etc/squid3/squid.conf https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/squid.conf
-    /sbin/iptables -I INPUT -p tcp --dport 3128 -j ACCEPT
-    service squid3 restart
-    update-rc.d squid3 defaults
-    ln -s /etc/squid3 /etc/squid
-elif [ $SOK_OS == "debian9" ]; then
-    # OS = Debian 9
-    /bin/rm -rf /etc/squid
-    /usr/bin/apt update > /dev/null 2>&1
-    /usr/bin/apt -y install apache2-utils squid > /dev/null 2>&1
-    touch /etc/squid/passwd
-    /bin/rm -f /etc/squid/squid.conf
-    /usr/bin/touch /etc/squid/blacklist.acl
-    /usr/bin/wget -q --no-check-certificate -O /etc/squid/squid.conf https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/squid.conf
-    /sbin/iptables -I INPUT -p tcp --dport 3128 -j ACCEPT
-    systemctl enable squid
-    systemctl restart squid
-elif [ $SOK_OS == "debian10" ]; then
-    # OS = Debian 10
-    /bin/rm -rf /etc/squid
-    /usr/bin/apt update > /dev/null 2>&1
-    /usr/bin/apt -y install apache2-utils squid > /dev/null 2>&1
-    touch /etc/squid/passwd
-    /bin/rm -f /etc/squid/squid.conf
-    /usr/bin/touch /etc/squid/blacklist.acl
-    /usr/bin/wget -q --no-check-certificate -O /etc/squid/squid.conf https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/squid.conf
-    /sbin/iptables -I INPUT -p tcp --dport 3128 -j ACCEPT
-    systemctl enable squid
-    systemctl restart squid
-elif [ $SOK_OS == "debian11" ]; then
-    # OS = Debian GNU/Linux 11 (bullseye)
-    /bin/rm -rf /etc/squid
+}
+
+apt_update_install(){
+    # Update for Debian/Ubuntu based linux
     /usr/bin/apt update > /dev/null 2>&1
-    /usr/bin/apt -y install apache2-utils squid > /dev/null 2>&1
-    touch /etc/squid/passwd
-    /bin/rm -f /etc/squid/squid.conf
-    /usr/bin/touch /etc/squid/blacklist.acl
-    /usr/bin/wget -q --no-check-certificate -O /etc/squid/squid.conf https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/squid.conf
-    if [ -f /sbin/iptables ]; then
-        /sbin/iptables -I INPUT -p tcp --dport 3128 -j ACCEPT
+    /usr/bin/apt -y install "$@" > /dev/null 2>&1
+}
+
+config_setup(){
+    # Write squid configuration files
+    # First argument is the configuration file URL
+    local config_url="$1"
+
+    # Determine the base directory for Squid
+    if [ -d "/etc/squid3" ]; then
+        local squid_dir="/etc/squid3"
+    else
+        local squid_dir="/etc/squid"
     fi
-    systemctl enable squid
-    systemctl restart squid
-elif [ $SOK_OS == "debian12" ]; then
-    # OS = Debian GNU/Linux 12 (bookworm)
-    /bin/rm -rf /etc/squid
-    /usr/bin/apt update > /dev/null 2>&1
-    /usr/bin/apt -y install apache2-utils squid  > /dev/null 2>&1
-    touch /etc/squid/passwd
-    /usr/bin/wget -q --no-check-certificate -O /etc/squid/conf.d/serverok.conf https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/conf/debian12.conf
+
+    touch "$squid_dir/passwd"
+    mv "$squid_dir/squid.conf" "$squid_dir/squid.conf.bak"
+    /usr/bin/touch "$squid_dir/blacklist.acl"
+
+    # Use the provided URL, or a default URL if none is passed
+    /usr/bin/wget -q --no-check-certificate -O "$squid_dir/squid.conf" ${config_url:-https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/squid.conf}
+}
+
+setup_firewall(){
+    # Open 3128 port for squid service
     if [ -f /sbin/iptables ]; then
         /sbin/iptables -I INPUT -p tcp --dport 3128 -j ACCEPT
+        /sbin/iptables-save
     fi
-    systemctl enable squid
-    systemctl restart squid
-elif [ $SOK_OS == "centos7" ]; then
-    echo "CentOS Linux 7 reached End of Life (EOL) nn June 30, 2024. Please use to newer OS"
-    exit 1
-elif [ "$SOK_OS" == "centos8" ] || [ "$SOK_OS" == "almalinux8" ] || [ "$SOK_OS" == "almalinux9" ]; then
-    yum install squid httpd-tools wget -y
-    mv /etc/squid/squid.conf /etc/squid/squid.conf.bak
-    /usr/bin/touch /etc/squid/blacklist.acl
-    /usr/bin/wget -q --no-check-certificate -O /etc/squid/squid.conf https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/conf/squid-centos7.conf
-    systemctl enable squid
-    systemctl restart squid
+}
+
+setup_firewall_centos(){
+    # Open 3128 port for squid service
     if [ -f /usr/bin/firewall-cmd ]; then
         firewall-cmd --zone=public --permanent --add-port=3128/tcp > /dev/null 2>&1
         firewall-cmd --reload > /dev/null 2>&1
     fi
-elif [ "$SOK_OS" == "centos8s" ]; then
-    dnf install squid httpd-tools wget -y > /dev/null 2>&1
-    mv /etc/squid/squid.conf /etc/squid/squid.conf.bak 
-    /usr/bin/touch /etc/squid/blacklist.acl
-    /usr/bin/wget -q --no-check-certificate -O /etc/squid/squid.conf https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/conf/squid-centos7.conf
-    systemctl enable squid  > /dev/null 2>&1
-    systemctl restart squid > /dev/null 2>&1
-    if [ -f /usr/bin/firewall-cmd ]; then
-        firewall-cmd --zone=public --permanent --add-port=3128/tcp > /dev/null 2>&1
-        firewall-cmd --reload > /dev/null 2>&1
+}
+
+# Restarting squid
+restart_squid(){
+    if command -v systemctl &>/dev/null; then
+        systemctl enable squid  > /dev/null 2>&1
+        systemctl restart squid
+    else
+        systemctl enable squid  > /dev/null 2>&1
+        service squid restart
     fi
-elif [ "$SOK_OS" == "centos9" ]; then
-    dnf install squid httpd-tools wget -y > /dev/null 2>&1
-    mv /etc/squid/squid.conf /etc/squid/squid.conf.sok
-    /usr/bin/touch /etc/squid/blacklist.acl
-    /usr/bin/wget -q --no-check-certificate -O /etc/squid/squid.conf https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/conf/squid-centos7.conf
-    systemctl enable squid  > /dev/null 2>&1
-    systemctl restart squid > /dev/null 2>&1
-    if [ -f /usr/bin/firewall-cmd ]; then
-        firewall-cmd --zone=public --permanent --add-port=3128/tcp > /dev/null 2>&1
-        firewall-cmd --reload > /dev/null 2>&1
+}
+
+install_squid(){
+    if [ $SOK_OS == "ubuntu2404" ] || [ $SOK_OS == "ubuntu2204" ]; then
+        apt_update_install "apache2-utils" "squid"
+        config_setup "https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/conf/ubuntu-2204.conf"
+        setup_firewall
+        restart_squid
+
+    elif [ $SOK_OS == "ubuntu2004" ]; then
+        apt_update_install "apache2-utils" "squid"
+        config_setup
+        setup_firewall
+        restart_squid
+
+    elif [ $SOK_OS == "ubuntu1804" ]; then
+        apt_update_install "apache2-utils" "squid3"
+        config_setup
+        setup_firewall
+        restart_squid
+
+    elif [ $SOK_OS == "ubuntu1604" ]; then
+        apt_update_install "apache2-utils" "squid3"
+        config_setup
+        setup_firewall
+        service squid restart
+        update-rc.d squid defaults
+
+    elif [ $SOK_OS == "ubuntu1404" ]; then
+        apt_update_install "apache2-utils" "squid3"
+        config_setup
+        setup_firewall
+        service squid3 restart
+        ln -s /etc/squid3 /etc/squid
+        #update-rc.d squid3 defaults
+        ln -s /etc/squid3 /etc/squid
+
+    elif [ $SOK_OS == "debian8" ]; then
+        # OS = Debian 8
+        apt_update_install "apache2-utils" "squid3"
+        config_setup
+        setup_firewall
+        service squid3 restart
+        update-rc.d squid3 defaults
+        ln -s /etc/squid3 /etc/squid
+
+    elif [ $SOK_OS == "debian11" ] || [ $SOK_OS == "debian10" ] || [ $SOK_OS == "debian9" ]; then
+        apt_update_install "apache2-utils" "squid"
+        config_setup
+        setup_firewall
+        restart_squid
+
+    elif [ $SOK_OS == "debian12" ]; then
+        # OS = Debian GNU/Linux 12 (bookworm)
+        apt_update_install "apache2-utils" "squid"
+        config_setup "https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/conf/debian12.conf"
+        setup_firewall
+        restart_squid
+
+    elif [ $SOK_OS == "centos7" ]; then
+        echo "CentOS Linux 7 reached End of Life (EOL) nn June 30, 2024. Please use to newer OS"
+        exit 1
+    elif [ "$SOK_OS" == "centos8" ] || [ "$SOK_OS" == "almalinux8" ] || [ "$SOK_OS" == "almalinux9" ]; then
+        yum install squid httpd-tools wget -y
+        config_setup "https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/conf/squid-centos7.conf"
+        restart_squid
+        setup_firewall_centos
+
+    elif [ "$SOK_OS" == "centos9" ] || [ "$SOK_OS" == "centos8s" ]; then
+        dnf install squid httpd-tools wget -y > /dev/null 2>&1
+        config_setup "https://raw.githubusercontent.com/serverok/squid-proxy-installer/master/conf/squid-centos7.conf"
+        restart_squid
+        setup_firewall_centos
     fi
-fi
+}
+
+# Main functions 
+install_command_script
+checks
+echo -e "Installing squid on ${SOK_OS}, please wait....\n"
+install_squid
+
 
 GREEN='\033[0;32m'
 CYAN='\033[0;36m'