diff --git a/service-locator/src/main/java/com/iluwatar/servicelocator/App.java b/service-locator/src/main/java/com/iluwatar/servicelocator/App.java
index f5704c54f..49d871ca9 100644
--- a/service-locator/src/main/java/com/iluwatar/servicelocator/App.java
+++ b/service-locator/src/main/java/com/iluwatar/servicelocator/App.java
@@ -45,7 +45,7 @@ public class App {
    * @param args command line args
    */
   public static void main(String[] args) {
-    Service service = ServiceLocator.getService("jndi/serviceA");
+    var service = ServiceLocator.getService("jndi/serviceA");
     service.execute();
     service = ServiceLocator.getService("jndi/serviceB");
     service.execute();
diff --git a/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceLocator.java b/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceLocator.java
index a94d8289e..60f0f7c03 100644
--- a/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceLocator.java
+++ b/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceLocator.java
@@ -45,7 +45,7 @@ public final class ServiceLocator {
    * @return {@link Service}
    */
   public static Service getService(String serviceJndiName) {
-    Service serviceObj = serviceCache.getService(serviceJndiName);
+    var serviceObj = serviceCache.getService(serviceJndiName);
     if (serviceObj != null) {
       return serviceObj;
     } else {
@@ -53,7 +53,7 @@ public final class ServiceLocator {
        * If we are unable to retrive anything from cache, then lookup the service and add it in the
        * cache map
        */
-      InitContext ctx = new InitContext();
+      var ctx = new InitContext();
       serviceObj = (Service) ctx.lookup(serviceJndiName);
       if (serviceObj != null) { // Only cache a service if it actually exists
         serviceCache.addService(serviceObj);