diff --git a/event-driven-architecture/src/main/java/com/iluwatar/eda/event/UserCreatedEvent.java b/event-driven-architecture/src/main/java/com/iluwatar/eda/event/UserCreatedEvent.java
index f7be8cb6c..245f79b4c 100644
--- a/event-driven-architecture/src/main/java/com/iluwatar/eda/event/UserCreatedEvent.java
+++ b/event-driven-architecture/src/main/java/com/iluwatar/eda/event/UserCreatedEvent.java
@@ -29,9 +29,9 @@ import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
 /**
- * The {@link UserCreatedEvent} should should be dispatched whenever a user has been created. This
- * class can be extended to contain details about the user has been created. In this example, the
- * entire {@link User} object is passed on as data with the event.
+ * The {@link UserCreatedEvent} should be dispatched whenever a user has been created.
+ * This class can be extended to contain details about the user has been created.
+ * In this example, the entire {@link User} object is passed on as data with the event.
  */
 @RequiredArgsConstructor
 @Getter
diff --git a/event-driven-architecture/src/main/java/com/iluwatar/eda/event/UserUpdatedEvent.java b/event-driven-architecture/src/main/java/com/iluwatar/eda/event/UserUpdatedEvent.java
index 57a5e4586..6fa1832cb 100644
--- a/event-driven-architecture/src/main/java/com/iluwatar/eda/event/UserUpdatedEvent.java
+++ b/event-driven-architecture/src/main/java/com/iluwatar/eda/event/UserUpdatedEvent.java
@@ -29,9 +29,9 @@ import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
 /**
- * The {@link UserUpdatedEvent} should should be dispatched whenever a user has been updated. This
- * class can be extended to contain details about the user has been updated. In this example, the
- * entire {@link User} object is passed on as data with the event.
+ * The {@link UserUpdatedEvent} should be dispatched whenever a user has been updated.
+ * This class can be extended to contain details about the user has been updated.
+ * In this example, the entire {@link User} object is passed on as data with the event.
  */
 @RequiredArgsConstructor
 @Getter
diff --git a/event-driven-architecture/src/main/java/com/iluwatar/eda/framework/EventDispatcher.java b/event-driven-architecture/src/main/java/com/iluwatar/eda/framework/EventDispatcher.java
index e5edd780a..1d0fab9d5 100644
--- a/event-driven-architecture/src/main/java/com/iluwatar/eda/framework/EventDispatcher.java
+++ b/event-driven-architecture/src/main/java/com/iluwatar/eda/framework/EventDispatcher.java
@@ -53,7 +53,7 @@ public class EventDispatcher {
   }
 
   /**
-   * Dispatches an {@link Event} depending on it's type.
+   * Dispatches an {@link Event} depending on its type.
    *
    * @param event The {@link Event} to be dispatched
    */
@@ -65,4 +65,4 @@ public class EventDispatcher {
     }
   }
 
-}
\ No newline at end of file
+}
diff --git a/event-driven-architecture/src/main/java/com/iluwatar/eda/framework/Handler.java b/event-driven-architecture/src/main/java/com/iluwatar/eda/framework/Handler.java
index d81a5c04f..8eb56ca0c 100644
--- a/event-driven-architecture/src/main/java/com/iluwatar/eda/framework/Handler.java
+++ b/event-driven-architecture/src/main/java/com/iluwatar/eda/framework/Handler.java
@@ -34,7 +34,7 @@ public interface Handler<E extends Event> {
 
   /**
    * The onEvent method should implement and handle behavior related to the event. This can be as
-   * simple as calling another service to handle the event on publishing the event on a queue to be
+   * simple as calling another service to handle the event on publishing the event in a queue to be
    * consumed by other sub systems.
    *
    * @param event the {@link Event} object to be handled.
diff --git a/event-driven-architecture/src/test/java/com/iluwatar/eda/AppTest.java b/event-driven-architecture/src/test/java/com/iluwatar/eda/AppTest.java
index f4d1f18a8..17f3bddaa 100644
--- a/event-driven-architecture/src/test/java/com/iluwatar/eda/AppTest.java
+++ b/event-driven-architecture/src/test/java/com/iluwatar/eda/AppTest.java
@@ -35,7 +35,7 @@ class AppTest {
 
   /**
    * Issue: Add at least one assertion to this test case.
-   *
+   * <p>
    * Solution: Inserted assertion to check whether the execution of the main method in {@link App#main(String[])}
    * throws an exception.
    */