diff --git a/api/src/main/java/org/openmrs/module/fhir2/api/translators/impl/EpisodeOfCareTranslatorImpl.java b/api/src/main/java/org/openmrs/module/fhir2/api/translators/impl/EpisodeOfCareTranslatorImpl.java
index f030283dc..dd856ce19 100644
--- a/api/src/main/java/org/openmrs/module/fhir2/api/translators/impl/EpisodeOfCareTranslatorImpl.java
+++ b/api/src/main/java/org/openmrs/module/fhir2/api/translators/impl/EpisodeOfCareTranslatorImpl.java
@@ -64,7 +64,8 @@ public PatientProgram toOpenmrsType(@Nonnull EpisodeOfCare episodeOfCare) {
 	
 	@Override
 	public PatientProgram toOpenmrsType(@Nonnull PatientProgram patientProgram, @Nonnull EpisodeOfCare episodeOfCare) {
-        throw new UnsupportedOperationException("Translation from FHIR resource EpisodeOfCare to OpenMRS object PatientProgram is not supported.");
+		throw new UnsupportedOperationException(
+		        "Translation from FHIR resource EpisodeOfCare to OpenMRS object PatientProgram is not supported.");
 	}
 	
 	private List<CodeableConcept> getType(PatientProgram patientProgram) {
diff --git a/api/src/test/java/org/openmrs/module/fhir2/api/translators/impl/EncounterTranslatorImplTest.java b/api/src/test/java/org/openmrs/module/fhir2/api/translators/impl/EncounterTranslatorImplTest.java
index 4a7a039d6..d12572fc2 100644
--- a/api/src/test/java/org/openmrs/module/fhir2/api/translators/impl/EncounterTranslatorImplTest.java
+++ b/api/src/test/java/org/openmrs/module/fhir2/api/translators/impl/EncounterTranslatorImplTest.java
@@ -103,7 +103,7 @@ public class EncounterTranslatorImplTest {
 	
 	@Mock
 	private EncounterClassMap encounterClassMap;
-
+	
 	@Mock
 	private EncounterService encounterService;
 	
@@ -246,7 +246,8 @@ public void toOpenMrsType_shouldTranslateParticipantToEncounterProvider() {
 		Patient patient = new Patient();
 		patient.setUuid(PATIENT_UUID);
 		when(patientReferenceTranslator.toOpenmrsType(patientRef)).thenReturn(patient);
-		when(participantTranslator.toOpenmrsType(ArgumentMatchers.any(), ArgumentMatchers.any())).thenReturn(new EncounterProvider());
+		when(participantTranslator.toOpenmrsType(ArgumentMatchers.any(), ArgumentMatchers.any()))
+		        .thenReturn(new EncounterProvider());
 		org.openmrs.Encounter result = encounterTranslator.toOpenmrsType(fhirEncounter);
 		
 		assertThat(result.getEncounterProviders(), not(empty()));
diff --git a/api/src/test/java/org/openmrs/module/fhir2/api/translators/impl/EpisodeOfCareTranslatorImplTest.java b/api/src/test/java/org/openmrs/module/fhir2/api/translators/impl/EpisodeOfCareTranslatorImplTest.java
index 813dbb230..349a6af2a 100644
--- a/api/src/test/java/org/openmrs/module/fhir2/api/translators/impl/EpisodeOfCareTranslatorImplTest.java
+++ b/api/src/test/java/org/openmrs/module/fhir2/api/translators/impl/EpisodeOfCareTranslatorImplTest.java
@@ -39,7 +39,7 @@
 
 @RunWith(MockitoJUnitRunner.class)
 public class EpisodeOfCareTranslatorImplTest {
-
+	
 	private static final String PATIENT_UUID = "8549f706-7e85-4c1d-9424-217d50a2988b";
 	
 	private static final String PATIENT_URI = FhirConstants.PATIENT + "/" + PATIENT_UUID;
@@ -162,6 +162,6 @@ public void shouldTranslateVoidedPatientProgramToFinishesStatus() {
 	@Test
 	public void shouldThrowsUnsupportedExceptionForTranslationToOpenmrsType() {
 		EpisodeOfCare episodeOfCare = new EpisodeOfCare();
-        assertThrows(UnsupportedOperationException.class, () -> episodeOfCareTranslator.toOpenmrsType(episodeOfCare));
+		assertThrows(UnsupportedOperationException.class, () -> episodeOfCareTranslator.toOpenmrsType(episodeOfCare));
 	}
 }
diff --git a/api/src/test/java/org/openmrs/module/fhir2/api/translators/impl/ValueSetTranslatorImplTest.java b/api/src/test/java/org/openmrs/module/fhir2/api/translators/impl/ValueSetTranslatorImplTest.java
index feaa333e1..a4252bf78 100644
--- a/api/src/test/java/org/openmrs/module/fhir2/api/translators/impl/ValueSetTranslatorImplTest.java
+++ b/api/src/test/java/org/openmrs/module/fhir2/api/translators/impl/ValueSetTranslatorImplTest.java
@@ -29,11 +29,11 @@
 import org.openmrs.Concept;
 import org.openmrs.ConceptDescription;
 import org.openmrs.ConceptMap;
+import org.openmrs.ConceptMapType;
 import org.openmrs.ConceptName;
 import org.openmrs.ConceptReferenceTerm;
 import org.openmrs.ConceptSet;
 import org.openmrs.ConceptSource;
-import org.openmrs.ConceptMapType;
 import org.openmrs.module.fhir2.FhirTestConstants;
 import org.openmrs.module.fhir2.TestFhirSpringConfiguration;
 import org.openmrs.module.fhir2.api.FhirConceptSourceService;
@@ -76,7 +76,7 @@ public void shouldTranslateConceptSetToValueSet() {
 		ConceptMap conceptMap = mock(ConceptMap.class);
 		ConceptReferenceTerm conceptReferenceTerm = mock(ConceptReferenceTerm.class);
 		ConceptSource conceptSource = mock(ConceptSource.class);
-		ConceptMapType conceptMapType=mock(ConceptMapType.class);
+		ConceptMapType conceptMapType = mock(ConceptMapType.class);
 		
 		when(conceptMap.getConceptReferenceTerm()).thenReturn(conceptReferenceTerm);
 		when(conceptMap.getConceptMapType()).thenReturn(conceptMapType);