diff --git a/spring-ldap/src/main/java/org/springframework/transaction/compensating/support/AbstractCompensatingTransactionManagerDelegate.java b/spring-ldap/src/main/java/org/springframework/transaction/compensating/support/AbstractCompensatingTransactionManagerDelegate.java
index 9dd03360..6288d2fe 100644
--- a/spring-ldap/src/main/java/org/springframework/transaction/compensating/support/AbstractCompensatingTransactionManagerDelegate.java
+++ b/spring-ldap/src/main/java/org/springframework/transaction/compensating/support/AbstractCompensatingTransactionManagerDelegate.java
@@ -63,8 +63,6 @@ public abstract class AbstractCompensatingTransactionManagerDelegate {
     protected abstract Object getTransactionSynchronizationKey();
 
     /*
-     * (non-Javadoc)
-     * 
      * @see org.springframework.jdbc.datasource.DataSourceTransactionManager#doGetTransaction()
      */
     public Object doGetTransaction() throws TransactionException {
@@ -76,8 +74,6 @@ public abstract class AbstractCompensatingTransactionManagerDelegate {
     }
 
     /*
-     * (non-Javadoc)
-     * 
      * @see org.springframework.jdbc.datasource.DataSourceTransactionManager#doBegin(java.lang.Object,
      *      org.springframework.transaction.TransactionDefinition)
      */
@@ -95,8 +91,6 @@ public abstract class AbstractCompensatingTransactionManagerDelegate {
     }
 
     /*
-     * (non-Javadoc)
-     * 
      * @see org.springframework.jdbc.datasource.DataSourceTransactionManager#doCommit(org.springframework.transaction.support.DefaultTransactionStatus)
      */
     public void doCommit(DefaultTransactionStatus status)
@@ -108,8 +102,6 @@ public abstract class AbstractCompensatingTransactionManagerDelegate {
     }
 
     /*
-     * (non-Javadoc)
-     * 
      * @see org.springframework.jdbc.datasource.DataSourceTransactionManager#doRollback(org.springframework.transaction.support.DefaultTransactionStatus)
      */
     public void doRollback(DefaultTransactionStatus status)
@@ -120,8 +112,6 @@ public abstract class AbstractCompensatingTransactionManagerDelegate {
     }
 
     /*
-     * (non-Javadoc)
-     * 
      * @see org.springframework.jdbc.datasource.DataSourceTransactionManager#doCleanupAfterCompletion(java.lang.Object)
      */
     public void doCleanupAfterCompletion(Object transaction) {
@@ -137,5 +127,4 @@ public abstract class AbstractCompensatingTransactionManagerDelegate {
 
         txObject.getHolder().clear();
     }
-
 }
\ No newline at end of file
diff --git a/spring-ldap/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionHolderSupport.java b/spring-ldap/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionHolderSupport.java
index 25e5ade9..de90a8e0 100644
--- a/spring-ldap/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionHolderSupport.java
+++ b/spring-ldap/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionHolderSupport.java
@@ -48,6 +48,9 @@ public abstract class CompensatingTransactionHolderSupport extends
      */
     protected abstract Object getTransactedResource();
 
+    /*
+     * @see org.springframework.transaction.support.ResourceHolderSupport#clear()
+     */
     public void clear() {
         super.clear();
         transactionOperationManager = null;
diff --git a/spring-ldap/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionObject.java b/spring-ldap/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionObject.java
index e5662291..16dc4be7 100644
--- a/spring-ldap/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionObject.java
+++ b/spring-ldap/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionObject.java
@@ -15,11 +15,11 @@
  */
 package org.springframework.transaction.compensating.support;
 
-import org.springframework.ldap.transaction.compensating.manager.DirContextHolder;
-
 /**
- * Transaction object for ContextSourceTransactionManager. Keeps a reference to
- * the {@link DirContextHolder} associated with the current transaction.
+ * Transaction object used by
+ * {@link AbstractCompensatingTransactionManagerDelegate}. Keeps a reference to
+ * the {@link CompensatingTransactionHolderSupport} associated with the current
+ * transaction.
  * 
  * @author Mattias Arthursson
  * @since 1.2
diff --git a/spring-ldap/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionUtils.java b/spring-ldap/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionUtils.java
index bf4bf96b..594d4e75 100644
--- a/spring-ldap/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionUtils.java
+++ b/spring-ldap/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionUtils.java
@@ -37,9 +37,9 @@ public class CompensatingTransactionUtils {
     }
 
     /**
-     * Perform the specified operation, storing the state prior to the
-     * operation, to enable commit/rollback later. If no transaction is
-     * currently active, proceed with the original call on the target.
+     * Perform the specified operation, storing the state prior to the operation
+     * in order to enable commit/rollback later. If no transaction is currently
+     * active, proceed with the original call on the target.
      * 
      * @param synchronizationKey
      *            the transaction synchronization key we are operating on
diff --git a/spring-ldap/src/main/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManager.java b/spring-ldap/src/main/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManager.java
index afbec1ea..b947d970 100644
--- a/spring-ldap/src/main/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManager.java
+++ b/spring-ldap/src/main/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManager.java
@@ -29,7 +29,7 @@ import org.springframework.transaction.compensating.CompensatingTransactionOpera
 /**
  * Default implementation of {@link CompensatingTransactionOperationManager}.
  * Manages a stack of {@link CompensatingTransactionOperationExecutor} objects
- * and manages rollback of these in the reverse order.
+ * and performs rollback of these in the reverse order.
  * 
  * @author Mattias Arthursson
  * @since 1.2
@@ -56,8 +56,6 @@ public class DefaultCompensatingTransactionOperationManager implements
     }
 
     /*
-     * (non-Javadoc)
-     * 
      * @see org.springframework.transaction.compensating.CompensatingTransactionOperationManager#performOperation(java.lang.Object,
      *      java.lang.String, java.lang.Object[])
      */
@@ -75,8 +73,6 @@ public class DefaultCompensatingTransactionOperationManager implements
     }
 
     /*
-     * (non-Javadoc)
-     * 
      * @see org.springframework.ldap.support.transaction.CompensatingTransactionOperationManager#rollback()
      */
     public void rollback() {
@@ -94,7 +90,7 @@ public class DefaultCompensatingTransactionOperationManager implements
     }
 
     /**
-     * Get the rollback operations. Package protected for testing purposes.
+     * Get the rollback operations. Used for testing purposes.
      * 
      * @return the rollback operations.
      */
@@ -114,8 +110,6 @@ public class DefaultCompensatingTransactionOperationManager implements
     }
 
     /*
-     * (non-Javadoc)
-     * 
      * @see org.springframework.ldap.support.transaction.CompensatingTransactionOperationManager#commit()
      */
     public void commit() {
@@ -131,5 +125,4 @@ public class DefaultCompensatingTransactionOperationManager implements
             }
         }
     }
-
 }