diff --git a/chain/src/main/java/com/iluwatar/chain/OrcCommander.java b/chain/src/main/java/com/iluwatar/chain/OrcCommander.java
index 048ba4954..073ea257e 100644
--- a/chain/src/main/java/com/iluwatar/chain/OrcCommander.java
+++ b/chain/src/main/java/com/iluwatar/chain/OrcCommander.java
@@ -35,7 +35,7 @@ public class OrcCommander extends RequestHandler {
 
   @Override
   public void handleRequest(Request req) {
-    if (req.getRequestType().equals(RequestType.DEFEND_CASTLE)) {
+    if (RequestType.DEFEND_CASTLE == req.getRequestType()) {
       printHandling(req);
       req.markHandled();
     } else {
diff --git a/chain/src/main/java/com/iluwatar/chain/OrcOfficer.java b/chain/src/main/java/com/iluwatar/chain/OrcOfficer.java
index 8e90b7ca0..2c2902266 100644
--- a/chain/src/main/java/com/iluwatar/chain/OrcOfficer.java
+++ b/chain/src/main/java/com/iluwatar/chain/OrcOfficer.java
@@ -35,7 +35,7 @@ public class OrcOfficer extends RequestHandler {
 
   @Override
   public void handleRequest(Request req) {
-    if (req.getRequestType().equals(RequestType.TORTURE_PRISONER)) {
+    if (RequestType.TORTURE_PRISONER == req.getRequestType()) {
       printHandling(req);
       req.markHandled();
     } else {
diff --git a/chain/src/main/java/com/iluwatar/chain/OrcSoldier.java b/chain/src/main/java/com/iluwatar/chain/OrcSoldier.java
index 99e0d5022..adc25fb2b 100644
--- a/chain/src/main/java/com/iluwatar/chain/OrcSoldier.java
+++ b/chain/src/main/java/com/iluwatar/chain/OrcSoldier.java
@@ -35,7 +35,7 @@ public class OrcSoldier extends RequestHandler {
 
   @Override
   public void handleRequest(Request req) {
-    if (req.getRequestType().equals(RequestType.COLLECT_TAX)) {
+    if (RequestType.COLLECT_TAX == req.getRequestType()) {
       printHandling(req);
       req.markHandled();
     } else {