diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/RestClient.java b/azure-client-runtime/src/main/java/com/microsoft/azure/RestClient.java
index 2cd137953fe7..0ace881f0ee5 100644
--- a/azure-client-runtime/src/main/java/com/microsoft/azure/RestClient.java
+++ b/azure-client-runtime/src/main/java/com/microsoft/azure/RestClient.java
@@ -14,6 +14,12 @@
 import com.microsoft.rest.credentials.ServiceClientCredentials;
 import com.microsoft.rest.retry.RetryHandler;
 import com.microsoft.rest.serializer.JacksonMapperAdapter;
+import okhttp3.ConnectionPool;
+import okhttp3.Interceptor;
+import okhttp3.JavaNetCookieJar;
+import okhttp3.OkHttpClient;
+import okhttp3.logging.HttpLoggingInterceptor;
+import retrofit2.Retrofit;
 
 import java.lang.reflect.Field;
 import java.net.CookieManager;
@@ -22,13 +28,6 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 
-import okhttp3.ConnectionPool;
-import okhttp3.Interceptor;
-import okhttp3.JavaNetCookieJar;
-import okhttp3.OkHttpClient;
-import okhttp3.logging.HttpLoggingInterceptor;
-import retrofit2.Retrofit;
-
 /**
  * An instance of this class stores the client information for making REST calls.
  */
diff --git a/build-tools/src/main/resources/checkstyle.xml b/build-tools/src/main/resources/checkstyle.xml
index 1875d6f100ca..b7f934898253 100644
--- a/build-tools/src/main/resources/checkstyle.xml
+++ b/build-tools/src/main/resources/checkstyle.xml
@@ -231,7 +231,6 @@
         -->
 
         <module name="FinalClass"/>
-        <module name="HideUtilityClassConstructor"/>
         <module name="InterfaceIsType"/>
         <module name="VisibilityModifier">
             <property name="protectedAllowed" value="true"/>
diff --git a/client-runtime/src/main/java/com/microsoft/rest/ServiceClient.java b/client-runtime/src/main/java/com/microsoft/rest/ServiceClient.java
index 8311a243de13..5d6f0f850336 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/ServiceClient.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/ServiceClient.java
@@ -40,6 +40,9 @@ protected ServiceClient(String baseUrl) {
     /**
      * Initializes a new instance of the ServiceClient class.
      *
+     * @param baseUrl the service base uri
+     * @param clientBuilder the http client builder
+     * @param restBuilder the retrofit rest client builder
      */
     protected ServiceClient(String baseUrl, OkHttpClient.Builder clientBuilder, Retrofit.Builder restBuilder) {
         if (clientBuilder == null) {