diff --git a/TravelCostCalculator.java b/TravelCostCalculator.java
index 6f89acb..8cdc9ab 100644
--- a/TravelCostCalculator.java
+++ b/TravelCostCalculator.java
@@ -1,3 +1,5 @@
+// EG/2020/4141 
+// Ranasinghe B.M.O.Y
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
@@ -5,71 +7,59 @@
 import java.util.HashMap;
 import java.util.Map;
 
+
 public class TravelCostCalculator {
     static Map<String, Double> a = new HashMap<>();
     static Map<String, Double> b = new HashMap<>();
     static Map<String, Double> c = new HashMap<>();
 
-    static void l1(String file) throws IOException {
+//CSV File reader
+    static void l_1(String file, Map array) throws IOException {
         BufferedReader reader = new BufferedReader(new FileReader(file));
-        String i; 
-        while ((i = reader.readLine()) != null) {
-            String[] p = i.split(",");
-            a.put(p[0].toUpperCase(), Double.parseDouble(p[1]));
+        String data;
+        while ((data = reader.readLine()) != null) {
+            String[] para = data.split(",");
+            array.put(para[0].toUpperCase(), Double.parseDouble(para[1]));
         }
     }
 
-    static void l2(String file) throws IOException {
-        BufferedReader reader = new BufferedReader(new FileReader(file));
-        String i;
-        while ((i = reader.readLine()) != null) {
-            String[] p = i.split(",");
-            b.put(p[0].toUpperCase(), Double.parseDouble(p[1]));
-        }
-    }
-
-    static void l3(String file) throws IOException {
-        BufferedReader reader = new BufferedReader(new FileReader(file));
-        String i;
-        while ((i = reader.readLine()) != null) {
-            String[] p = i.split(",");
-            c.put(p[0].toUpperCase(), Double.parseDouble(p[1]));
-        }
-    }
 
+//Main Function
     public static void main(String[] args) {
         try {
-            l1("data/hotel_rates.csv");
-            l2("data/exchange_rates.csv");
-            l3("data/flight_costs.csv");
-
+            l_1("data/hotel_rates.csv",a);
+            l_1("data/exchange_rates.csv", b);
+            l_1("data/flight_costs.csv", c);
+            
             BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
 
             System.out.print("Enter your destination: ");
             String destination = reader.readLine().toUpperCase();
-
-            double flight_cost = c.getOrDefault(destination, 0.0);
-            double hotel_cost = a.getOrDefault(destination, 0.0);
+            
+            double flightCost = c.getOrDefault(destination, 0.0);
+            double hotelCost = a.getOrDefault(destination, 0.0);
 
             System.out.print("Enter your stay duration in days: ");
-            int stay_duration = Integer.parseInt(reader.readLine());
-            hotel_cost *= stay_duration;
+            
+            int stayDuration = Integer.parseInt(reader.readLine());
+            hotelCost *= stayDuration;
+
+            double totalCostUsd = flightCost + hotelCost;
 
-            double total_cost_usd = flight_cost + hotel_cost;
+            System.out.printf("Flight cost: USD %.2f\n", flightCost);
+            System.out.printf("Hotel cost (%d days): USD %.2f\n", stayDuration, hotelCost);
+            System.out.printf("Total: USD %.2f\n", totalCostUsd);
 
-            System.out.printf("Flight cost: USD %.2f\n", flight_cost);
-            System.out.printf("Hotel cost (%d days): USD %.2f\n", stay_duration, hotel_cost);
-            System.out.printf("Total: USD %.2f\n", total_cost_usd);
+            String[] availableCurrencies = b.keySet().toArray(new String[0]);
+            System.out.print("Select your currency for final price estimation(" + String.join(", ", availableCurrencies) + "): ");
+            String selectedCurrency = reader.readLine();
 
-            String[] available_currencies = b.keySet().toArray(new String[0]);
-            System.out.print("Select your currency for final price estimation(" + String.join(", ", available_currencies) + "): ");
-            String selected_currency = reader.readLine();
+            double finalPriceLocalCurrency = totalCostUsd * b.get(selectedCurrency);
 
-            double final_price_local_currency = total_cost_usd * b.get(selected_currency);
+            System.out.printf("Total in %s: %.2f\n", selectedCurrency, finalPriceLocalCurrency);
 
-            System.out.printf("Total in %s: %.2f\n", selected_currency, final_price_local_currency);
-        } catch (IOException e) {
-            e.printStackTrace();
+        } catch (IOException error) {
+            error.printStackTrace();
         }
     }
 }