diff --git a/services/contracts/src/main/java/com/workup/contracts/commands/EvaluateMilestoneCommand.java b/services/contracts/src/main/java/com/workup/contracts/commands/EvaluateMilestoneCommand.java
index 92959fa5..488b0a7d 100644
--- a/services/contracts/src/main/java/com/workup/contracts/commands/EvaluateMilestoneCommand.java
+++ b/services/contracts/src/main/java/com/workup/contracts/commands/EvaluateMilestoneCommand.java
@@ -1,18 +1,16 @@
 package com.workup.contracts.commands;
 
 import com.workup.shared.commands.contracts.requests.EvaluateMilestoneRequest;
-
 import com.workup.shared.commands.contracts.responses.EvaluateMilestoneResponse;
 
 public class EvaluateMilestoneCommand
-        extends ContractCommand<EvaluateMilestoneRequest, EvaluateMilestoneResponse> {
-
-    @Override
-    public EvaluateMilestoneResponse Run(EvaluateMilestoneRequest request) {
-        // First we will get the milestones and add them to the database first,
-        // This will allow us to have their IDs for when we insert the contract.
+    extends ContractCommand<EvaluateMilestoneRequest, EvaluateMilestoneResponse> {
 
-        return null;
+  @Override
+  public EvaluateMilestoneResponse Run(EvaluateMilestoneRequest request) {
+    // First we will get the milestones and add them to the database first,
+    // This will allow us to have their IDs for when we insert the contract.
 
-    }
+    return null;
+  }
 }
diff --git a/services/contracts/src/main/java/com/workup/contracts/commands/GetContractCommand.java b/services/contracts/src/main/java/com/workup/contracts/commands/GetContractCommand.java
index 50198656..cd7aacd3 100644
--- a/services/contracts/src/main/java/com/workup/contracts/commands/GetContractCommand.java
+++ b/services/contracts/src/main/java/com/workup/contracts/commands/GetContractCommand.java
@@ -1,20 +1,16 @@
 package com.workup.contracts.commands;
 
-import com.workup.shared.commands.contracts.requests.EvaluateMilestoneRequest;
 
 import com.workup.shared.commands.contracts.requests.GetContractRequest;
-import com.workup.shared.commands.contracts.responses.EvaluateMilestoneResponse;
 import com.workup.shared.commands.contracts.responses.GetContractResponse;
 
-public class GetContractCommand
-        extends ContractCommand<GetContractRequest, GetContractResponse> {
+public class GetContractCommand extends ContractCommand<GetContractRequest, GetContractResponse> {
 
-    @Override
-    public GetContractResponse Run(GetContractRequest request) {
-        // First we will get the milestones and add them to the database first,
-        // This will allow us to have their IDs for when we insert the contract.
+  @Override
+  public GetContractResponse Run(GetContractRequest request) {
+    // First we will get the milestones and add them to the database first,
+    // This will allow us to have their IDs for when we insert the contract.
 
-        return null;
-
-    }
+    return null;
+  }
 }
diff --git a/services/contracts/src/main/java/com/workup/contracts/commands/GetMilestoneCommand.java b/services/contracts/src/main/java/com/workup/contracts/commands/GetMilestoneCommand.java
index 3308c0ce..8d875cc3 100644
--- a/services/contracts/src/main/java/com/workup/contracts/commands/GetMilestoneCommand.java
+++ b/services/contracts/src/main/java/com/workup/contracts/commands/GetMilestoneCommand.java
@@ -1,22 +1,17 @@
 package com.workup.contracts.commands;
 
-import com.workup.shared.commands.contracts.requests.EvaluateMilestoneRequest;
 
-import com.workup.shared.commands.contracts.requests.GetContractRequest;
 import com.workup.shared.commands.contracts.requests.GetMilestoneRequest;
-import com.workup.shared.commands.contracts.responses.EvaluateMilestoneResponse;
-import com.workup.shared.commands.contracts.responses.GetContractResponse;
 import com.workup.shared.commands.contracts.responses.GetMilestoneResponse;
 
 public class GetMilestoneCommand
-        extends ContractCommand<GetMilestoneRequest, GetMilestoneResponse> {
+    extends ContractCommand<GetMilestoneRequest, GetMilestoneResponse> {
 
-    @Override
-    public GetMilestoneResponse Run(GetMilestoneRequest request) {
-        // First we will get the milestones and add them to the database first,
-        // This will allow us to have their IDs for when we insert the contract.
+  @Override
+  public GetMilestoneResponse Run(GetMilestoneRequest request) {
+    // First we will get the milestones and add them to the database first,
+    // This will allow us to have their IDs for when we insert the contract.
 
-        return null;
-
-    }
+    return null;
+  }
 }
diff --git a/services/contracts/src/main/java/com/workup/contracts/commands/GetPendingTerminationsCommand.java b/services/contracts/src/main/java/com/workup/contracts/commands/GetPendingTerminationsCommand.java
index 2988202e..57f6f1fe 100644
--- a/services/contracts/src/main/java/com/workup/contracts/commands/GetPendingTerminationsCommand.java
+++ b/services/contracts/src/main/java/com/workup/contracts/commands/GetPendingTerminationsCommand.java
@@ -1,24 +1,17 @@
 package com.workup.contracts.commands;
 
-import com.workup.shared.commands.contracts.requests.EvaluateMilestoneRequest;
 
-import com.workup.shared.commands.contracts.requests.GetContractRequest;
-import com.workup.shared.commands.contracts.requests.GetMilestoneRequest;
 import com.workup.shared.commands.contracts.requests.GetPendingTerminationsRequest;
-import com.workup.shared.commands.contracts.responses.EvaluateMilestoneResponse;
-import com.workup.shared.commands.contracts.responses.GetContractResponse;
-import com.workup.shared.commands.contracts.responses.GetMilestoneResponse;
 import com.workup.shared.commands.contracts.responses.GetPendingTerminationsResponse;
 
 public class GetPendingTerminationsCommand
-        extends ContractCommand<GetPendingTerminationsRequest, GetPendingTerminationsResponse> {
+    extends ContractCommand<GetPendingTerminationsRequest, GetPendingTerminationsResponse> {
 
-    @Override
-    public GetPendingTerminationsResponse Run(GetPendingTerminationsRequest request) {
-        // First we will get the milestones and add them to the database first,
-        // This will allow us to have their IDs for when we insert the contract.
+  @Override
+  public GetPendingTerminationsResponse Run(GetPendingTerminationsRequest request) {
+    // First we will get the milestones and add them to the database first,
+    // This will allow us to have their IDs for when we insert the contract.
 
-        return null;
-
-    }
+    return null;
+  }
 }
diff --git a/services/contracts/src/main/java/com/workup/contracts/commands/ProgressMilestoneCommand.java b/services/contracts/src/main/java/com/workup/contracts/commands/ProgressMilestoneCommand.java
index ab886943..7b3591fc 100644
--- a/services/contracts/src/main/java/com/workup/contracts/commands/ProgressMilestoneCommand.java
+++ b/services/contracts/src/main/java/com/workup/contracts/commands/ProgressMilestoneCommand.java
@@ -1,20 +1,17 @@
 package com.workup.contracts.commands;
 
-import com.workup.shared.commands.contracts.requests.EvaluateMilestoneRequest;
 
 import com.workup.shared.commands.contracts.requests.ProgressMilestoneRequest;
-import com.workup.shared.commands.contracts.responses.EvaluateMilestoneResponse;
 import com.workup.shared.commands.contracts.responses.ProgressMilestoneResponse;
 
 public class ProgressMilestoneCommand
-        extends ContractCommand<ProgressMilestoneRequest, ProgressMilestoneResponse> {
+    extends ContractCommand<ProgressMilestoneRequest, ProgressMilestoneResponse> {
 
-    @Override
-    public ProgressMilestoneResponse Run(ProgressMilestoneRequest request) {
-        // First we will get the milestones and add them to the database first,
-        // This will allow us to have their IDs for when we insert the contract.
+  @Override
+  public ProgressMilestoneResponse Run(ProgressMilestoneRequest request) {
+    // First we will get the milestones and add them to the database first,
+    // This will allow us to have their IDs for when we insert the contract.
 
-        return null;
-
-    }
+    return null;
+  }
 }
diff --git a/shared/src/main/java/com/workup/shared/commands/contracts/requests/GetContractRequest.java b/shared/src/main/java/com/workup/shared/commands/contracts/requests/GetContractRequest.java
index 5fbb7726..e9ba104e 100644
--- a/shared/src/main/java/com/workup/shared/commands/contracts/requests/GetContractRequest.java
+++ b/shared/src/main/java/com/workup/shared/commands/contracts/requests/GetContractRequest.java
@@ -1,7 +1,6 @@
 package com.workup.shared.commands.contracts.requests;
 
 import com.workup.shared.commands.CommandRequest;
-import com.workup.shared.enums.contracts.TerminationRequestStatus;
 import lombok.Getter;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
@@ -11,5 +10,5 @@
 @SuperBuilder(setterPrefix = "with")
 @Jacksonized
 public class GetContractRequest extends CommandRequest {
-    private final String contractId;
+  private final String contractId;
 }
diff --git a/shared/src/main/java/com/workup/shared/commands/contracts/requests/GetMilestoneRequest.java b/shared/src/main/java/com/workup/shared/commands/contracts/requests/GetMilestoneRequest.java
index b9dc48b6..6d87533f 100644
--- a/shared/src/main/java/com/workup/shared/commands/contracts/requests/GetMilestoneRequest.java
+++ b/shared/src/main/java/com/workup/shared/commands/contracts/requests/GetMilestoneRequest.java
@@ -1,7 +1,6 @@
 package com.workup.shared.commands.contracts.requests;
 
 import com.workup.shared.commands.CommandRequest;
-import com.workup.shared.enums.contracts.TerminationRequestStatus;
 import lombok.Getter;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
@@ -12,5 +11,5 @@
 @Jacksonized
 public class GetMilestoneRequest extends CommandRequest {
 
-    private final String milestoneId;
+  private final String milestoneId;
 }
diff --git a/shared/src/main/java/com/workup/shared/commands/contracts/requests/GetPendingTerminationsRequest.java b/shared/src/main/java/com/workup/shared/commands/contracts/requests/GetPendingTerminationsRequest.java
index e5ee968a..c550287c 100644
--- a/shared/src/main/java/com/workup/shared/commands/contracts/requests/GetPendingTerminationsRequest.java
+++ b/shared/src/main/java/com/workup/shared/commands/contracts/requests/GetPendingTerminationsRequest.java
@@ -1,7 +1,6 @@
 package com.workup.shared.commands.contracts.requests;
 
 import com.workup.shared.commands.CommandRequest;
-import com.workup.shared.enums.contracts.TerminationRequestStatus;
 import lombok.Getter;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
@@ -11,5 +10,5 @@
 @SuperBuilder(setterPrefix = "with")
 @Jacksonized
 public class GetPendingTerminationsRequest extends CommandRequest {
-    private final String contractId;
+  private final String contractId;
 }
diff --git a/shared/src/main/java/com/workup/shared/commands/contracts/responses/GetContractResponse.java b/shared/src/main/java/com/workup/shared/commands/contracts/responses/GetContractResponse.java
index 3165d795..cafbb1c8 100644
--- a/shared/src/main/java/com/workup/shared/commands/contracts/responses/GetContractResponse.java
+++ b/shared/src/main/java/com/workup/shared/commands/contracts/responses/GetContractResponse.java
@@ -2,25 +2,21 @@
 
 import com.workup.shared.commands.CommandResponse;
 import com.workup.shared.enums.contracts.ContractState;
+import java.util.List;
 import lombok.Getter;
-import lombok.Setter;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
-import java.util.List;
-import java.util.UUID;
-
 @Getter
 @SuperBuilder(setterPrefix = "with")
 @Jacksonized
 public class GetContractResponse extends CommandResponse {
-    private final String contractId;
-    private String jobTitle;
-    private String jobId;
-    private String proposalId;
-    private String freelancerId;
-    private String clientId;
-    private List<String> milestonesIds;
-    private ContractState status;
-
+  private final String contractId;
+  private String jobTitle;
+  private String jobId;
+  private String proposalId;
+  private String freelancerId;
+  private String clientId;
+  private List<String> milestonesIds;
+  private ContractState status;
 }
diff --git a/shared/src/main/java/com/workup/shared/commands/contracts/responses/GetMilestoneResponse.java b/shared/src/main/java/com/workup/shared/commands/contracts/responses/GetMilestoneResponse.java
index 241c9cbb..9dd60802 100644
--- a/shared/src/main/java/com/workup/shared/commands/contracts/responses/GetMilestoneResponse.java
+++ b/shared/src/main/java/com/workup/shared/commands/contracts/responses/GetMilestoneResponse.java
@@ -10,5 +10,5 @@
 @SuperBuilder(setterPrefix = "with")
 @Jacksonized
 public class GetMilestoneResponse extends CommandResponse {
-    private final Milestone milestone;
+  private final Milestone milestone;
 }
diff --git a/shared/src/main/java/com/workup/shared/commands/contracts/responses/GetPendingTerminationsResponse.java b/shared/src/main/java/com/workup/shared/commands/contracts/responses/GetPendingTerminationsResponse.java
index f22819d3..4a028848 100644
--- a/shared/src/main/java/com/workup/shared/commands/contracts/responses/GetPendingTerminationsResponse.java
+++ b/shared/src/main/java/com/workup/shared/commands/contracts/responses/GetPendingTerminationsResponse.java
@@ -1,24 +1,20 @@
 package com.workup.shared.commands.contracts.responses;
 
 import com.workup.shared.commands.CommandResponse;
-import com.workup.shared.commands.contracts.Milestone;
 import com.workup.shared.enums.contracts.TerminationRequestStatus;
 import lombok.Getter;
-import lombok.Setter;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
-import java.util.UUID;
-
 @Getter
 @SuperBuilder(setterPrefix = "with")
 @Jacksonized
 public class GetPendingTerminationsResponse extends CommandResponse {
-    private String requestId;
+  private String requestId;
 
-    private String contractId;
-    private String requesterId;
-    private String reason;
+  private String contractId;
+  private String requesterId;
+  private String reason;
 
-    private TerminationRequestStatus status;
+  private TerminationRequestStatus status;
 }