diff --git a/src/main/java/com/thoughtworks/gauge/DataStoreInitializer.java b/src/main/java/com/thoughtworks/gauge/DataStoreInitializer.java
index 1f2178b9..6df36dcc 100644
--- a/src/main/java/com/thoughtworks/gauge/DataStoreInitializer.java
+++ b/src/main/java/com/thoughtworks/gauge/DataStoreInitializer.java
@@ -23,7 +23,6 @@
 import gauge.messages.Spec;
 
 public class DataStoreInitializer implements IMessageProcessor {
-    @Override
     public Messages.Message process(Messages.Message message) {
         switch (message.getMessageType()) {
             case SuiteDataStoreInit:
diff --git a/src/main/java/com/thoughtworks/gauge/processor/MethodExecutionMessageProcessor.java b/src/main/java/com/thoughtworks/gauge/processor/MethodExecutionMessageProcessor.java
index c84cacdc..d068ea6b 100644
--- a/src/main/java/com/thoughtworks/gauge/processor/MethodExecutionMessageProcessor.java
+++ b/src/main/java/com/thoughtworks/gauge/processor/MethodExecutionMessageProcessor.java
@@ -51,11 +51,11 @@ public Messages.Message execute(Set<Method> methods, Messages.Message message, O
         return createMessageWithExecutionStatusResponse(message, passingExecution);
     }
 
-    public Messages.Message executeHooks(Set<Method> beforeSpecHooks, Messages.Message message, SpecificationInfo executionInfo) {
+    public Messages.Message executeHooks(Set<Method> hooks, Messages.Message message, SpecificationInfo executionInfo) {
         MethodExecutor methodExecutor = new MethodExecutor();
         Spec.ProtoExecutionResult result;
         long totalHooksExecutionTime = 0;
-        for (Method method : beforeSpecHooks) {
+        for (Method method : hooks) {
             if (methodHasArguments(method, executionInfo)) {
                 result = methodExecutor.execute(method, executionInfo);
             } else {