diff --git a/distance_calculator.py b/distance_calculator.py
index a9607d9..e02d934 100644
--- a/distance_calculator.py
+++ b/distance_calculator.py
@@ -9,71 +9,64 @@
 
 # Importing module(s)
 import math
-# Calculate distance
-def calculate_distance(startX, startY, endX, endY):
-    return math.sqrt(math.pow(startX - endX, 2) + math.pow(startY - endY, 2))
 
 # Main loop
-def main():
+while True:
+    print("Welcome to the distance calculator v1.0.1!")
+    use_program=input("Do you want to calculate the distance between two points? (yes/no): ")
+    if use_program.lower() == "yes":
+        pass
+    elif use_program.lower() == "no":
+        print("Thank you for using the distance calculator!")
+        quit()
+    else:
+        print("Invalid input! Please enter 'yes' or 'no'.")
+        continue    
+
+    # Input validation for startX, startY, endX, endY
+
+    # startX
     while True:
-        print("Welcome to the distance calculator v1.0.1!")
-        use_program=input("Do you want to calculate the distance between two points? (yes/no): ")
-        if use_program.lower() == "yes":
-            pass
-        elif use_program.lower() == "no":
-            print("Thank you for using the distance calculator!")
-            quit()
+        startX = input("Enter starting x-coordinate: ")
+        if not startX.isnumeric():
+            print("Error! Input has to be a number!")
+            continue
         else:
-            print("Invalid input! Please enter 'yes' or 'no'.")
-            continue    
-    
-        # Input validation for startX, startY, endX, endY
-    
-        # startX
-        while True:
-            startX = input("Enter starting x-coordinate: ")
-            if not startX.isnumeric():
-                print("Error! Input has to be a number!")
-                continue
-            else:
-                break
-        
-        # startY
-        while True:
-            startY = input("Enter starting y-coordinate: ")
-            if not startY.isnumeric():
-                print("Error! Input has to be a number!")
-                continue
-            else:
-                break
+            break
     
-        # endX
-        while True:
-            endX = input("Enter ending x-coordinate: ")
-            if not endX.isnumeric():
-                print("Error! Input has to be a number!")
-                continue
-            else:
-                break
-    
-        # endY    
-        while True:
-            endY = input("Enter ending y-coordinate: ")
-            if not endY.isnumeric():
-                print("Error! Input has to be a number!")
-                continue
-            else:
-                break
-    
-        # Converting the values to floats
-        startX = float(startX)
-        startY = float(startY)
-        endX = float(endX)
-        endY = float(endY)
-    
-        # The calculation
-        distance = calculate_distance(startX, startY, endX, endY)
-        print(f"The distance between ({startX}, {startY}) and ({endX}, {endY}) is {distance} units.")
+    # startY
+    while True:
+        startY = input("Enter starting y-coordinate: ")
+        if not startY.isnumeric():
+            print("Error! Input has to be a number!")
+            continue
+        else:
+            break
+
+    # endX
+    while True:
+        endX = input("Enter ending x-coordinate: ")
+        if not endX.isnumeric():
+            print("Error! Input has to be a number!")
+            continue
+        else:
+            break
+
+    # endY    
+    while True:
+        endY = input("Enter ending y-coordinate: ")
+        if not endY.isnumeric():
+            print("Error! Input has to be a number!")
+            continue
+        else:
+            break
+
+    # Converting the values to floats
+    startX = float(startX)
+    startY = float(startY)
+    endX = float(endX)
+    endY = float(endY)
 
-if __name__ == "__main__":
-    main()
+    # The calculation
+    distance = math.sqrt(math.pow(startX - endX, 2) + math.pow(startY - endY, 2))
+    print(f"The distance between ({startX}, {startY}) and ({endX}, {endY}) is {distance} units.")