diff --git a/src/Test1.java b/src/Test1.java
index 3c3c38d..fc0cf0a 100644
--- a/src/Test1.java
+++ b/src/Test1.java
@@ -1,37 +1,20 @@
-import java.util.*;
-
-enum Operation
-{
-    ADD, SUBTRACT, MULTIPLY, DIVIDE
-}
-public class Test1 {
-
-    public static double basicCalculator(final Operation operation, final int num1, final int num2){
+public static double basicCalculator(Operation operation, int num1, int num2){
         double result = 0;
 
-        switch(operation) {
-            case ADD:
-                // if operation = ADD, return the sum
-                result = num1 + num2;
-                break;
-            case SUBTRACT:
-                result = num1 - num2;
-                break;
-            case MULTIPLY:
-                result = num1 * num2;
-                break;
-            case DIVIDE:
-                if (num2 == 0) {
-                    System.out.println("Can't divide by 0");
-                } else {
-                    result = ((double)num1) / num2;
-                }
-                break;
-        }
-        return result;
-    }
+   useIfElse
+        if (operation == Operation.ADD) {
+	 result = num1 + num2;
+	} else if (operation == Operation.SUBTRACT) {
+	 result = num1 - num2;
+	} else if (operation == Operation.MULTIPLY) {
+	 result = num1 * num2;
+	} else if (operation == Operation.DIVIDE) {
+	 if (num2 == 0) {
+	  System.out.println("Can't divide by 0");
+	 } else {
+	  result = ((double)num1) / num2;
+	 }
+	}
 
-    public static void main(final String[] args) {
-        System.out.println(basicCalculator(Operation.DIVIDE, 1, 2));
+	return result;
     }
-}