diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionClientInterceptor.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionClientInterceptor.java
index a0bf653d09c..24b14b59b6b 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionClientInterceptor.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionClientInterceptor.java
@@ -17,24 +17,21 @@
 
 package com.sun.enterprise.transaction.jts.iiop;
 
+import static com.sun.corba.ee.spi.presentation.rmi.StubAdapter.isLocal;
+
 import org.glassfish.hk2.api.ServiceLocator;
 import org.omg.CORBA.LocalObject;
 import org.omg.PortableInterceptor.ClientRequestInfo;
 import org.omg.PortableInterceptor.ClientRequestInterceptor;
 
-import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
 import com.sun.enterprise.transaction.api.JavaEETransactionManager;
 
-public class TransactionClientInterceptor extends LocalObject
-        implements ClientRequestInterceptor, Comparable<TransactionClientInterceptor> {
+public class TransactionClientInterceptor extends LocalObject implements ClientRequestInterceptor, Comparable<TransactionClientInterceptor> {
 
-    /**
-     *
-     */
     private static final long serialVersionUID = 1L;
+
     private String name;
     private int order;
-
     private JavaEETransactionManager eeTransactionManager;
 
     /**
@@ -79,7 +76,7 @@ public void send_request(ClientRequestInfo clientRequestInfo) {
         // Check if there is an exportable transaction on current thread
         Object target = clientRequestInfo.effective_target();
         if (eeTransactionManager != null) {
-            eeTransactionManager.checkTransactionExport(StubAdapter.isLocal(target));
+            eeTransactionManager.checkTransactionExport(isLocal(target));
         }
     }
 
diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TxIORInterceptor.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TxIORInterceptor.java
index 87f11949f66..c7b368b7819 100755
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TxIORInterceptor.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TxIORInterceptor.java
@@ -17,7 +17,9 @@
 
 package com.sun.enterprise.transaction.jts.iiop;
 
-import java.util.logging.Level;
+import static java.util.logging.Level.FINE;
+import static java.util.logging.Level.WARNING;
+
 import java.util.logging.Logger;
 
 import org.glassfish.enterprise.iiop.api.GlassFishORBHelper;
@@ -37,28 +39,21 @@
 import org.omg.PortableInterceptor.IORInfo;
 import org.omg.PortableInterceptor.IORInterceptor;
 
+import com.sun.jts.pi.InterceptorImpl;
 import com.sun.logging.LogDomains;
 
 public class TxIORInterceptor extends LocalObject implements IORInterceptor {
 
-    /**
-     *
-     */
     private static final long serialVersionUID = 1L;
 
-    private static Logger _logger = LogDomains.getLogger(com.sun.jts.pi.InterceptorImpl.class, LogDomains.TRANSACTION_LOGGER);
+    private static Logger _logger = LogDomains.getLogger(InterceptorImpl.class, LogDomains.TRANSACTION_LOGGER);
 
     private Codec codec;
+    private ServiceLocator serviceLocator;
 
-    private ServiceLocator habitat;
-
-    public TxIORInterceptor(Codec c, ServiceLocator h) {
-        codec = c;
-        habitat = h;
-    }
-
-    @Override
-    public void destroy() {
+    public TxIORInterceptor(Codec codec, ServiceLocator serviceLocator) {
+        this.codec = codec;
+        this.serviceLocator = serviceLocator;
     }
 
     @Override
@@ -71,24 +66,28 @@ public String name() {
     @Override
     public void establish_components(IORInfo iorInfo) {
         try {
-            _logger.log(Level.FINE, "TxIORInterceptor.establish_components->:");
+            _logger.log(FINE, "TxIORInterceptor.establish_components->:");
 
             // Add OTS tagged components. These are always the same for all EJBs
             OTSPolicy otsPolicy = null;
             try {
-                otsPolicy = (OTSPolicy) iorInfo.get_effective_policy(habitat.getService(GlassFishORBHelper.class).getOTSPolicyType());
+                otsPolicy = (OTSPolicy) iorInfo.get_effective_policy(serviceLocator.getService(GlassFishORBHelper.class).getOTSPolicyType());
             } catch (INV_POLICY ex) {
-                _logger.log(Level.FINE, "TxIORInterceptor.establish_components: OTSPolicy not present");
+                _logger.log(FINE, "TxIORInterceptor.establish_components: OTSPolicy not present");
             }
             addOTSComponents(iorInfo, otsPolicy);
 
         } catch (Exception e) {
-            _logger.log(Level.WARNING, "Exception in establish_components", e);
+            _logger.log(WARNING, "Exception in establish_components", e);
         } finally {
-            _logger.log(Level.FINE, "TxIORInterceptor.establish_components<-:");
+            _logger.log(FINE, "TxIORInterceptor.establish_components<-:");
         }
     }
 
+    @Override
+    public void destroy() {
+    }
+
     private void addOTSComponents(IORInfo iorInfo, OTSPolicy otsPolicy) {
         short invPolicyValue = SHARED.value;
         short otsPolicyValue = ADAPTS.value;
@@ -119,6 +118,4 @@ private void addOTSComponents(IORInfo iorInfo, OTSPolicy otsPolicy) {
         iorInfo.add_ior_component(invComp);
     }
 
-}
-
-// End of file.
+}
\ No newline at end of file