diff --git a/pom.xml b/pom.xml
index 9199e38..06550bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-java</artifactId>
-            <version>3.12.0</version>
+            <version>3.13.0</version>
         </dependency>
 
         <dependency>
@@ -84,6 +84,14 @@
             <scope>provided</scope>
         </dependency>
 
+<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-collections4 -->
+<dependency>
+    <groupId>org.apache.commons</groupId>
+    <artifactId>commons-collections4</artifactId>
+    <version>4.2</version>
+</dependency>
+
+
     </dependencies>
 
     <build>
diff --git a/src/main/java/com/selenium/pages/MainPage.java b/src/main/java/com/selenium/pages/MainPage.java
index d46ab84..b96475c 100644
--- a/src/main/java/com/selenium/pages/MainPage.java
+++ b/src/main/java/com/selenium/pages/MainPage.java
@@ -58,10 +58,7 @@ public boolean verifyValidUserInput(WebDriver driver, String userInput){
             _reusableFunc.enterText(driver, user_message_input, userInput);
             _reusableFunc.click(driver, show_message_button);
             String message = _reusableFunc.getTextByInnerText(driver, show_message_text);
-
-            if (_reusableFunc.verifyTextMatch(driver, message, userInput)){
-                flag = true;
-            }
+            flag = ReusableFunctions.verifyTextMatch(driver, message, userInput);
 
         }catch(Exception Ex){
             logger.error("Exception Occurred While Verifying Valid User Input: "+Ex.getMessage());
@@ -79,10 +76,7 @@ public boolean verifyAdditionFunctionality(WebDriver driver, String numA, String
             _reusableFunc.enterText(driver, enter_second_value, numB);
             _reusableFunc.click(driver, get_total_button);
             String addition = _reusableFunc.getTextByInnerText(driver, show_total_text);
-
-            if (_reusableFunc.verifyTextMatch(driver, addition, expected)){
-                flag = true;
-            }
+           flag = ReusableFunctions.verifyTextMatch(driver, addition, expected);
 
         }catch(Exception Ex){
             logger.error("Exception Occurred While Verifying Addition Functionality: "+Ex.getMessage());
diff --git a/src/test/java/com/selenium/listeners/ExtentManager.java b/src/test/java/com/selenium/listeners/ExtentManager.java
index c0a5f35..9c89542 100644
--- a/src/test/java/com/selenium/listeners/ExtentManager.java
+++ b/src/test/java/com/selenium/listeners/ExtentManager.java
@@ -17,7 +17,7 @@ public class ExtentManager {
     private static ExtentTest logger;
 
     public ExtentManager(ExtentReports reports){
-        this.extent = reports;
+        extent = reports;
     }
 
     public synchronized static ExtentReports getReporter() throws IOException {
diff --git a/src/test/java/com/selenium/listeners/Transformer.java b/src/test/java/com/selenium/listeners/Transformer.java
index c5b54d4..1536301 100644
--- a/src/test/java/com/selenium/listeners/Transformer.java
+++ b/src/test/java/com/selenium/listeners/Transformer.java
@@ -10,15 +10,9 @@
 import org.testng.annotations.ITestAnnotation;
 
 public class Transformer implements IAnnotationTransformer {
-    public static DataReader reader = new DataReader();
-    public static TestBase testBase = new TestBase();
-    public static HashMap<String, HashMap<String, String>> runmodeData = reader.testDataMappedToTestName(testBase.prop.getProperty("TestDataExcelFileName"), testBase.prop.getProperty("RunModeSheetName"));
+    public static HashMap<String, HashMap<String, String>> runmodeData = DataReader.testDataMappedToTestName(TestBase.prop.getProperty("TestDataExcelFileName"), TestBase.prop.getProperty("RunModeSheetName"));
 
     public void transform(ITestAnnotation annotation, Class testClass, Constructor testConstructor, Method testMethod) {
-        if (DataReader.isRunnable(testMethod.getName(), runmodeData)) {
-            annotation.setEnabled(true);
-        }else if (! DataReader.isRunnable(testMethod.getName(), runmodeData)) {
-            annotation.setEnabled(false);
-        }
+            annotation.setEnabled(DataReader.isRunnable(testMethod.getName(), runmodeData));
     }
 }
diff --git a/src/test/java/com/selenium/testcases/MainPageTests.java b/src/test/java/com/selenium/testcases/MainPageTests.java
index 6719505..e2f5e64 100644
--- a/src/test/java/com/selenium/testcases/MainPageTests.java
+++ b/src/test/java/com/selenium/testcases/MainPageTests.java
@@ -13,7 +13,6 @@
 import org.testng.ITestResult;
 import org.testng.annotations.*;
 import org.testng.asserts.SoftAssert;
-
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.HashMap;
@@ -30,7 +29,7 @@ public class MainPageTests extends TestBase {
 
     public static DataReader reader = new DataReader();
 
-    public static HashMap<String, HashMap<String, String>> tcData = reader.testDataMappedToTestName(prop.getProperty("TestDataExcelFileName"), prop.getProperty("TestDataSheetName"));
+    public static HashMap<String, HashMap<String, String>> tcData = DataReader.testDataMappedToTestName(prop.getProperty("TestDataExcelFileName"), prop.getProperty("TestDataSheetName"));
 
     public MainPageTests(){
         super();
@@ -44,8 +43,8 @@ public static void setUp(Method method) throws IOException {
 
         testCaseName = method.getName();
         extManager = new ExtentManager(extent);
-        extent = extManager.getReporter();
-        logger = extManager.getLogger(testCaseName);
+        extent = ExtentManager.getReporter();
+        logger = ExtentManager.getLogger(testCaseName);
     }
 
     @Test(priority = 1)