diff --git a/serverless/src/main/java/com/iluwatar/serverless/baas/model/Person.java b/serverless/src/main/java/com/iluwatar/serverless/baas/model/Person.java
index 3328b8370..cf8a30d3f 100644
--- a/serverless/src/main/java/com/iluwatar/serverless/baas/model/Person.java
+++ b/serverless/src/main/java/com/iluwatar/serverless/baas/model/Person.java
@@ -107,7 +107,7 @@ public class Person implements Serializable {
 
   @Override
   public int hashCode() {
-    int result = firstName != null ? firstName.hashCode() : 0;
+    var result = firstName != null ? firstName.hashCode() : 0;
     result = 31 * result + (lastName != null ? lastName.hashCode() : 0);
     result = 31 * result + (address != null ? address.hashCode() : 0);
     return result;
diff --git a/serverless/src/main/java/com/iluwatar/serverless/faas/LambdaInfo.java b/serverless/src/main/java/com/iluwatar/serverless/faas/LambdaInfo.java
index 4186cfef8..8fec38457 100644
--- a/serverless/src/main/java/com/iluwatar/serverless/faas/LambdaInfo.java
+++ b/serverless/src/main/java/com/iluwatar/serverless/faas/LambdaInfo.java
@@ -130,7 +130,7 @@ public class LambdaInfo implements Serializable {
 
   @Override
   public int hashCode() {
-    int result = awsRequestId != null ? awsRequestId.hashCode() : 0;
+    var result = awsRequestId != null ? awsRequestId.hashCode() : 0;
     result = 31 * result + (logGroupName != null ? logGroupName.hashCode() : 0);
     result = 31 * result + (logStreamName != null ? logStreamName.hashCode() : 0);
     result = 31 * result + (functionName != null ? functionName.hashCode() : 0);
diff --git a/serverless/src/main/java/com/iluwatar/serverless/faas/api/LambdaInfoApiHandler.java b/serverless/src/main/java/com/iluwatar/serverless/faas/api/LambdaInfoApiHandler.java
index b88c24612..62b73ee57 100644
--- a/serverless/src/main/java/com/iluwatar/serverless/faas/api/LambdaInfoApiHandler.java
+++ b/serverless/src/main/java/com/iluwatar/serverless/faas/api/LambdaInfoApiHandler.java
@@ -63,7 +63,7 @@ public class LambdaInfoApiHandler implements RequestHandler<Map<String, Object>,
    * @return LambdaInfo
    */
   private LambdaInfo lambdaInfo(Context context) {
-    LambdaInfo lambdaInfo = new LambdaInfo();
+    var lambdaInfo = new LambdaInfo();
     lambdaInfo.setAwsRequestId(context.getAwsRequestId());
     lambdaInfo.setFunctionName(context.getFunctionName());
     lambdaInfo.setFunctionVersion(context.getFunctionVersion());
@@ -75,7 +75,7 @@ public class LambdaInfoApiHandler implements RequestHandler<Map<String, Object>,
   }
 
   private Map<String, String> headers() {
-    Map<String, String> headers = new HashMap<>();
+    var headers = new HashMap<String, String>();
     headers.put("Content-Type", "application/json");
 
     return headers;