diff --git a/components/org.wso2.carbon.identity.auth.service/src/main/java/org/wso2/carbon/identity/auth/service/handler/impl/BasicClientAuthenticationHandler.java b/components/org.wso2.carbon.identity.auth.service/src/main/java/org/wso2/carbon/identity/auth/service/handler/impl/BasicClientAuthenticationHandler.java
index 62921723..62ab1e73 100644
--- a/components/org.wso2.carbon.identity.auth.service/src/main/java/org/wso2/carbon/identity/auth/service/handler/impl/BasicClientAuthenticationHandler.java
+++ b/components/org.wso2.carbon.identity.auth.service/src/main/java/org/wso2/carbon/identity/auth/service/handler/impl/BasicClientAuthenticationHandler.java
@@ -38,7 +38,6 @@
 import org.wso2.carbon.identity.oauth2.util.OAuth2Util;
 
 import java.nio.charset.Charset;
-import java.util.List;
 
 import static org.wso2.carbon.identity.auth.service.util.AuthConfigurationUtil.isAuthHeaderMatch;
 
diff --git a/components/org.wso2.carbon.identity.auth.valve/src/main/java/org/wso2/carbon/identity/auth/valve/OAuthAppTenantResolverValve.java b/components/org.wso2.carbon.identity.auth.valve/src/main/java/org/wso2/carbon/identity/auth/valve/OAuthAppTenantResolverValve.java
index 53409477..fc8a27e5 100644
--- a/components/org.wso2.carbon.identity.auth.valve/src/main/java/org/wso2/carbon/identity/auth/valve/OAuthAppTenantResolverValve.java
+++ b/components/org.wso2.carbon.identity.auth.valve/src/main/java/org/wso2/carbon/identity/auth/valve/OAuthAppTenantResolverValve.java
@@ -44,12 +44,12 @@
  *
  * When tenant qualified urls are not enabled, we need to set the tenant domain of the oauth app to the thread
  * local. This is because with the client id tenant uniqueness improvement, DAO layer requires the tenant domain
- * and client id to retrieve an app and the tenant is not available in the request path. Note that when tenant
+ * and client id to retrieve an app when the tenant is not available in the request path. Note that when tenant
  * qualified urls are disabled, client id is unique across the server.
  */
 public class OAuthAppTenantResolverValve extends ValveBase {
 
-    private static final Log log = LogFactory.getLog(OAuthAppTenantResolverValve.class);
+    private static final Log LOG = LogFactory.getLog(OAuthAppTenantResolverValve.class);
     private static String oAuthServerBaseURL = null;
     private static String oAuth2ServerBaseURL = null;
 
@@ -74,8 +74,8 @@ public void invoke(Request request, Response response) throws IOException, Servl
                                 clientId = credentials[0];
                             }
                         } catch (OAuthClientAuthnException e) {
-                            if (log.isDebugEnabled()) {
-                                log.debug("Error while extracting credentials from authorization header.", e);
+                            if (LOG.isDebugEnabled()) {
+                                LOG.debug("Error while extracting credentials from authorization header.", e);
                             }
                         }
                     }
@@ -86,10 +86,10 @@ public void invoke(Request request, Response response) throws IOException, Servl
                         OAuthAppDO oAuthAppDO = OAuth2Util.getAppInformationByClientIdOnly(clientId);
                         appTenant = OAuth2Util.getTenantDomainOfOauthApp(oAuthAppDO);
                     } catch (IdentityOAuth2Exception e) {
-                        log.error("Error while getting oauth app for client Id.", e);
+                        LOG.error("Error while getting oauth app for client Id.", e);
                     } catch (InvalidOAuthClientException e) {
-                        if (log.isDebugEnabled()) {
-                            log.debug("Error while getting oauth app for client Id: " + clientId, e);
+                        if (LOG.isDebugEnabled()) {
+                            LOG.debug("Error while getting oauth app for client Id: " + clientId, e);
                         }
                     }
                 }