diff --git a/memento/README.md b/memento/README.md
index b8d95b72a..8bbebd36a 100644
--- a/memento/README.md
+++ b/memento/README.md
@@ -34,9 +34,12 @@ Let's first define the types of stars we are capable to handle.
 
 ```java
 public enum StarType {
-
-  SUN("sun"), RED_GIANT("red giant"), WHITE_DWARF("white dwarf"), SUPERNOVA("supernova"), DEAD(
-      "dead star"), UNDEFINED("");
+  SUN("sun"),
+  RED_GIANT("red giant"),
+  WHITE_DWARF("white dwarf"),
+  SUPERNOVA("supernova"),
+  DEAD("dead star"),
+  UNDEFINED("");
 
   private final String title;
 
@@ -95,8 +98,7 @@ public class Star {
   }
 
   StarMemento getMemento() {
-
-    StarMementoInternal state = new StarMementoInternal();
+    var state = new StarMementoInternal();
     state.setAgeYears(ageYears);
     state.setMassTons(massTons);
     state.setType(type);
@@ -104,8 +106,7 @@ public class Star {
   }
 
   void setMemento(StarMemento memento) {
-
-    StarMementoInternal state = (StarMementoInternal) memento;
+    var state = (StarMementoInternal) memento;
     this.type = state.getType();
     this.ageYears = state.getAgeYears();
     this.massTons = state.getMassTons();
@@ -152,8 +153,8 @@ public class Star {
 And finally here's how we use the mementos to store and restore star states.
 
 ```java
-    Stack<StarMemento> states = new Stack<>();
-    Star star = new Star(StarType.SUN, 10000000, 500000);
+    var states = new Stack<>();
+    var star = new Star(StarType.SUN, 10000000, 500000);
     LOGGER.info(star.toString());
     states.add(star.getMemento());
     star.timePasses();
diff --git a/memento/src/main/java/com/iluwatar/memento/Star.java b/memento/src/main/java/com/iluwatar/memento/Star.java
index aac58b817..af1c98b04 100644
--- a/memento/src/main/java/com/iluwatar/memento/Star.java
+++ b/memento/src/main/java/com/iluwatar/memento/Star.java
@@ -70,22 +70,18 @@ public class Star {
   }
 
   StarMemento getMemento() {
-
     var state = new StarMementoInternal();
     state.setAgeYears(ageYears);
     state.setMassTons(massTons);
     state.setType(type);
     return state;
-
   }
 
   void setMemento(StarMemento memento) {
-
     var state = (StarMementoInternal) memento;
     this.type = state.getType();
     this.ageYears = state.getAgeYears();
     this.massTons = state.getMassTons();
-
   }
 
   @Override
diff --git a/memento/src/main/java/com/iluwatar/memento/StarType.java b/memento/src/main/java/com/iluwatar/memento/StarType.java
index 339f05f9f..aa92bf6e6 100644
--- a/memento/src/main/java/com/iluwatar/memento/StarType.java
+++ b/memento/src/main/java/com/iluwatar/memento/StarType.java
@@ -27,9 +27,12 @@ package com.iluwatar.memento;
  * StarType enumeration.
  */
 public enum StarType {
-
-  SUN("sun"), RED_GIANT("red giant"), WHITE_DWARF("white dwarf"), SUPERNOVA("supernova"), DEAD(
-      "dead star"), UNDEFINED("");
+  SUN("sun"),
+  RED_GIANT("red giant"),
+  WHITE_DWARF("white dwarf"),
+  SUPERNOVA("supernova"),
+  DEAD("dead star"),
+  UNDEFINED("");
 
   private final String title;