diff --git a/ND_ATMs/source/client.lua b/ND_ATMs/source/client.lua
index 83dbf22..530f44d 100644
--- a/ND_ATMs/source/client.lua
+++ b/ND_ATMs/source/client.lua
@@ -5,9 +5,6 @@
 --	   For support join my discord: https://discord.gg/Z9Mxu72zZ6	  --
 ------------------------------------------------------------------------
 ------------------------------------------------------------------------
-
---PlaySoundFrontend(-1, "PIN_BUTTON", "ATM_SOUNDS", 1)
-
 local display = false
 local balance = nil
 
@@ -19,29 +16,58 @@ local atmModels = {
 }
 
 local days = {
-    [0] = "Sunday",
-    [1] = "Monday",
-    [2] = "Tuesday",
-    [3] = "Wednesday",
-    [4] = "Thursday",
-    [5] = "Friday",
-    [6] = "Saturday"
+    "Sunday",
+    "Monday",
+    "Tuesday",
+    "Wednesday",
+    "Thursday",
+    "Friday",
+    "Saturday"
 }
 
-local months = {
-    [1] = "January",
-    [2] = "February",
-    [3] = "March",
-    [4] = "April",
-    [5] = "May",
-    [6] = "June",
-    [7] = "July",
-    [8] = "August",
-    [9] = "September",
-    [10] = "October",
-    [11] = "November",
-    [12] = "December"
-}
+-- Get the time
+function getTime()
+    local hours = GetClockHours()
+    local minutes = GetClockMinutes()
+    if hours <= 9 then
+        hours = "0" .. hours
+    end
+    if minutes <= 9 then
+        minutes = "0" .. minutes
+    end
+    return hours .. ":" .. minutes
+end
+
+-- Alert on top left of screen
+function alert(msg) 
+    BeginTextCommandDisplayHelp("STRING")
+    AddTextComponentSubstringPlayerName(msg)
+    EndTextCommandDisplayHelp(0, 0, 1, -1)
+end
+
+-- Check if player is near an atm
+function IsNearATM()
+	local playerCoords = GetEntityCoords(PlayerPedId(), 0)
+    for k, v in pairs(atmModels) do
+        ATM = GetCoordsAndRotationOfClosestObjectOfType(playerCoords.x, playerCoords.y, playerCoords.z, 0.7, tonumber(v), 0)
+        if ATM == 1 then
+            return true
+        end
+    end
+end
+
+-- Hide/Show ui
+function SetDisplay(bool)
+    display = bool
+    SetNuiFocus(bool, bool)
+    SendNUIMessage({
+        status = bool,
+		playerName = exports["ND_Core"]:getCharacterInfo(1) .. " " .. exports["ND_Core"]:getCharacterInfo(2),
+		balance = "Account Balance: $" .. exports["ND_Core"]:getCharacterInfo(8) .. ".00",
+        date = days[GetClockDayOfWeek() + 1],
+        time = getTime()
+    })
+end
 
 RegisterNUICallback("close", function(data)
     PlaySoundFrontend(-1, "PIN_BUTTON", "ATM_SOUNDS", 1)
@@ -77,67 +103,3 @@ Citizen.CreateThread(function()
 		end
 	end
 end)
-
--- Hide/Show ui
-function SetDisplay(bool)
-    display = bool
-    SetNuiFocus(bool, bool)
-    SendNUIMessage({
-        status = bool,
-		playerName = exports["ND_Core"]:getCharacterInfo(1) .. " " .. exports["ND_Core"]:getCharacterInfo(2),
-		balance = "Account Balance: $" .. exports["ND_Core"]:getCharacterInfo(8) .. ".00",
-        date = getDay() .. ", " .. getMonth() .. " " .. GetClockDayOfMonth() .. ", " .. GetClockYear(),
-        time = getTime()
-    })
-end
-
--- Get the time
-function getTime()
-    local hours = GetClockHours()
-    local minutes = GetClockMinutes()
-    if hours <= 9 then
-        hours = "0" .. hours
-    end
-    if minutes <= 9 then
-        minutes = "0" .. minutes
-    end
-    return hours .. ":" .. minutes
-end
-
--- Get the day of the week
-function getDay()
-    local currentDay = GetClockDayOfWeek()
-    for k, v in pairs(days) do
-        if currentDay == k then
-            return v
-        end
-    end
-end
-
--- Get Month of the year
-function getMonth()
-    local currentMonth = GetClockMonth()
-    for k, v in pairs(months) do
-        if currentMonth == k then
-            return v
-        end
-    end
-end
-
--- Alert on top left of screen
-function alert(msg) 
-    BeginTextCommandDisplayHelp("STRING")
-    AddTextComponentSubstringPlayerName(msg)
-    EndTextCommandDisplayHelp(0, 0, 1, -1)
-end
-
--- Check if player is near an atm
-function IsNearATM()
-	local playerCoords = GetEntityCoords(PlayerPedId(), 0)
-    for k, v in pairs(atmModels) do
-        ATM = GetCoordsAndRotationOfClosestObjectOfType(playerCoords.x, playerCoords.y, playerCoords.z, 0.7, tonumber(v), 0)
-        if ATM == 1 then
-            return true
-        end
-    end
-end
\ No newline at end of file