diff --git a/monostate/src/main/java/com/iluwatar/monostate/App.java b/monostate/src/main/java/com/iluwatar/monostate/App.java
index 64cb38461..9f5b2c173 100644
--- a/monostate/src/main/java/com/iluwatar/monostate/App.java
+++ b/monostate/src/main/java/com/iluwatar/monostate/App.java
@@ -30,7 +30,7 @@ package com.iluwatar.monostate;
  *
  * <p>In the following example, The {@link LoadBalancer} class represents the app's logic. It
  * contains a series of Servers, which can handle requests of type {@link Request}. Two instances of
- * LoadBalacer are created. When a request is made to a server via the first LoadBalancer the state
+ * LoadBalancer are created. When a request is made to a server via the first LoadBalancer the state
  * change in the first load balancer affects the second. So if the first LoadBalancer selects the
  * Server 1, the second LoadBalancer on a new request will select the Second server. If a third
  * LoadBalancer is created and a new request is made to it, then it will select the third server as
@@ -43,8 +43,8 @@ public class App {
    * @param args command line args
    */
   public static void main(String[] args) {
-    LoadBalancer loadBalancer1 = new LoadBalancer();
-    LoadBalancer loadBalancer2 = new LoadBalancer();
+    var loadBalancer1 = new LoadBalancer();
+    var loadBalancer2 = new LoadBalancer();
     loadBalancer1.serverRequest(new Request("Hello"));
     loadBalancer2.serverRequest(new Request("Hello World"));
   }
diff --git a/monostate/src/main/java/com/iluwatar/monostate/LoadBalancer.java b/monostate/src/main/java/com/iluwatar/monostate/LoadBalancer.java
index 8546ae177..7a784f514 100644
--- a/monostate/src/main/java/com/iluwatar/monostate/LoadBalancer.java
+++ b/monostate/src/main/java/com/iluwatar/monostate/LoadBalancer.java
@@ -38,8 +38,8 @@ public class LoadBalancer {
   private static int lastServedId;
 
   static {
-    int id = 0;
-    for (int port : new int[]{8080, 8081, 8082, 8083, 8084}) {
+    var id = 0;
+    for (var port : new int[]{8080, 8081, 8082, 8083, 8084}) {
       SERVERS.add(new Server("localhost", port, ++id));
     }
   }
@@ -69,7 +69,7 @@ public class LoadBalancer {
     if (lastServedId >= SERVERS.size()) {
       lastServedId = 0;
     }
-    Server server = SERVERS.get(lastServedId++);
+    var server = SERVERS.get(lastServedId++);
     server.serve(request);
   }
 
diff --git a/monostate/src/test/java/com/iluwatar/monostate/AppTest.java b/monostate/src/test/java/com/iluwatar/monostate/AppTest.java
index c914f136e..d17a56bb9 100644
--- a/monostate/src/test/java/com/iluwatar/monostate/AppTest.java
+++ b/monostate/src/test/java/com/iluwatar/monostate/AppTest.java
@@ -32,8 +32,7 @@ public class AppTest {
 
   @Test
   public void testMain() {
-    String[] args = {};
-    App.main(args);
+    App.main(new String[]{});
   }
 
 }
diff --git a/monostate/src/test/java/com/iluwatar/monostate/LoadBalancerTest.java b/monostate/src/test/java/com/iluwatar/monostate/LoadBalancerTest.java
index 736bf6ea6..d62c029e2 100644
--- a/monostate/src/test/java/com/iluwatar/monostate/LoadBalancerTest.java
+++ b/monostate/src/test/java/com/iluwatar/monostate/LoadBalancerTest.java
@@ -44,8 +44,8 @@ public class LoadBalancerTest {
 
   @Test
   public void testSameStateAmongstAllInstances() {
-    final LoadBalancer firstBalancer = new LoadBalancer();
-    final LoadBalancer secondBalancer = new LoadBalancer();
+    final var firstBalancer = new LoadBalancer();
+    final var secondBalancer = new LoadBalancer();
     firstBalancer.addServer(new Server("localhost", 8085, 6));
     // Both should have the same number of servers.
     assertEquals(firstBalancer.getNoOfServers(), secondBalancer.getNoOfServers());
@@ -55,18 +55,18 @@ public class LoadBalancerTest {
 
   @Test
   public void testServe() {
-    final Server server = mock(Server.class);
+    final var server = mock(Server.class);
     when(server.getHost()).thenReturn("testhost");
     when(server.getPort()).thenReturn(1234);
     doNothing().when(server).serve(any(Request.class));
 
-    final LoadBalancer loadBalancer = new LoadBalancer();
+    final var loadBalancer = new LoadBalancer();
     loadBalancer.addServer(server);
 
     verifyZeroInteractions(server);
 
-    final Request request = new Request("test");
-    for (int i = 0; i < loadBalancer.getNoOfServers() * 2; i++) {
+    final var request = new Request("test");
+    for (var i = 0; i < loadBalancer.getNoOfServers() * 2; i++) {
       loadBalancer.serverRequest(request);
     }