diff --git a/src/main/java/net/ihe/gazelle/adapter/servlet/ChHapiFhirServer.java b/src/main/java/net/ihe/gazelle/adapter/servlet/ChHapiFhirServer.java
index d0cc9b205f0b9b1a8cbb2226f6f5fad08d1319c2..de34314aaa579734e8206f2af0f278afd93e626c 100644
--- a/src/main/java/net/ihe/gazelle/adapter/servlet/ChHapiFhirServer.java
+++ b/src/main/java/net/ihe/gazelle/adapter/servlet/ChHapiFhirServer.java
@@ -22,6 +22,7 @@ import java.util.List;
 @WebServlet(urlPatterns = {"/fhir_ch/*"}, displayName = "FHIR Server CH")
 public class ChHapiFhirServer extends RestfulServer {
     private static final long serialVersionUID = 1L;
+
     @Inject
     private ChPatientResourceProvider chPatientResourceProvider;
 
diff --git a/src/main/java/net/ihe/gazelle/application/PatientRegistryFeedClient.java b/src/main/java/net/ihe/gazelle/application/PatientRegistryFeedClient.java
index 945eb7a80c84f122ee413189f9cc86cee854a221..8490e98b857d028be8306b1cda631d9404d21dd8 100644
--- a/src/main/java/net/ihe/gazelle/application/PatientRegistryFeedClient.java
+++ b/src/main/java/net/ihe/gazelle/application/PatientRegistryFeedClient.java
@@ -1,21 +1,6 @@
 package net.ihe.gazelle.application;
 
-import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.UnknownHostException;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.ws.WebServiceException;
-
-import org.hl7.fhir.r4.model.Bundle;
-
-import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
-import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
-import ca.uhn.fhir.rest.server.exceptions.ResourceGoneException;
-import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException;
-import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException;
+import ca.uhn.fhir.rest.server.exceptions.*;
 import net.ihe.gazelle.adapter.connector.BusinessToFhirConverter;
 import net.ihe.gazelle.adapter.connector.DeletionBundle;
 import net.ihe.gazelle.adapter.connector.UpdateBundle;
@@ -29,6 +14,13 @@ import net.ihe.gazelle.framework.preferencesmodelapi.application.NamespaceExcept
 import net.ihe.gazelle.framework.preferencesmodelapi.application.OperationalPreferencesService;
 import net.ihe.gazelle.framework.preferencesmodelapi.application.PreferenceException;
 import net.ihe.gazelle.lib.annotations.Package;
+import org.hl7.fhir.r4.model.Bundle;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.xml.ws.WebServiceException;
+import java.net.MalformedURLException;
+import java.net.URL;
 
 @Named("PatientRegistryFeedClient")
 public class PatientRegistryFeedClient {
@@ -200,7 +192,7 @@ public class PatientRegistryFeedClient {
 	 */
 	public Bundle mergePatient(String uuidOriginal, String uuidDuplicated) throws PatientFeedException {
 		if (client == null) {
-			logger.info("client not set");
+			logger.info(CLIENT_NOT_SET);
 			initializeClient();
 		}
 		if (uuidOriginal == null || uuidOriginal.isBlank()) {
@@ -229,7 +221,7 @@ public class PatientRegistryFeedClient {
 	 */
 	public Bundle delete(String uuid) throws PatientFeedException {
 		if (client == null) {
-			logger.info("client not set");
+			logger.info(CLIENT_NOT_SET);
 			initializeClient();
 		}
 		if (uuid == null || uuid.isBlank()) {
diff --git a/src/main/java/net/ihe/gazelle/application/PatientRegistrySearchClient.java b/src/main/java/net/ihe/gazelle/application/PatientRegistrySearchClient.java
index c6fabe936e3216cbbd2222a020a7105abd1ea1a6..8fab2cf957256115e99013db05025aff2b7683f5 100644
--- a/src/main/java/net/ihe/gazelle/application/PatientRegistrySearchClient.java
+++ b/src/main/java/net/ihe/gazelle/application/PatientRegistrySearchClient.java
@@ -1,22 +1,9 @@
 package net.ihe.gazelle.application;
 
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.ws.WebServiceException;
-
-import org.hl7.fhir.r4.model.OperationOutcome;
-
-import com.gitb.ps.ProcessingService;
-
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException;
+import com.gitb.ps.ProcessingService;
 import net.ihe.gazelle.adapter.connector.BusinessToFhirConverter;
 import net.ihe.gazelle.adapter.connector.ConversionException;
 import net.ihe.gazelle.adapter.preferences.Preferences;
@@ -33,6 +20,15 @@ import net.ihe.gazelle.lib.searchmodelapi.business.SearchCriteria;
 import net.ihe.gazelle.lib.searchmodelapi.business.exception.SearchException;
 import net.ihe.gazelle.lib.searchmodelapi.business.searchcriterion.SearchCriterion;
 import net.ihe.gazelle.lib.searchmodelapi.business.searchcriterion.StringSearchCriterion;
+import org.hl7.fhir.r4.model.OperationOutcome;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.xml.ws.WebServiceException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
 
 @Named("patientRegistrySearchClient")
 public class PatientRegistrySearchClient {