diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoCursorUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoCursorUtils.java
index 2df076d14..00b8b6335 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoCursorUtils.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoCursorUtils.java
@@ -34,7 +34,11 @@ import com.mongodb.DBCursor;
  * 
  * @author Oliver Gierke
  */
-class MongoCursorUtils {
+abstract class MongoCursorUtils {
+    
+    private MongoCursorUtils() {
+        
+    }
 
     /**
      * Creates a {@link CursorPreparer} applying the given {@link Pageable} to
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQuery.java
index 73059e200..c6f6a30e4 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQuery.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQuery.java
@@ -95,13 +95,25 @@ public class MongoQuery implements RepositoryQuery {
 
         protected List<?> readCollection(DBObject query) {
 
-            return operations.query(operations.getDefaultCollectionName(), query,
-                    method.getDomainClass());
+            return operations.query(operations.getDefaultCollectionName(),
+                    query, method.getDomainClass());
         }
     }
 
+    /**
+     * {@link Execution} for collection returning queries.
+     * 
+     * @author Oliver Gierke
+     */
     class CollectionExecution extends Execution {
 
+        /*
+         * (non-Javadoc)
+         * 
+         * @see
+         * org.springframework.data.document.mongodb.repository.MongoQuery.Execution
+         * #execute(com.mongodb.DBObject)
+         */
         @Override
         public Object execute(DBObject query) {
 
@@ -173,11 +185,17 @@ public class MongoQuery implements RepositoryQuery {
      */
     class SingleEntityExecution extends Execution {
 
+        /*
+         * (non-Javadoc)
+         * 
+         * @see
+         * org.springframework.data.document.mongodb.repository.MongoQuery.Execution
+         * #execute(com.mongodb.DBObject)
+         */
         @Override
         Object execute(DBObject query) {
 
             List<?> result = readCollection(query);
-
             return result.isEmpty() ? null : result.get(0);
         }
     }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQueryCreator.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQueryCreator.java
index 8af9eefca..0f752dcdc 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQueryCreator.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQueryCreator.java
@@ -108,7 +108,6 @@ class MongoQueryCreator extends AbstractQueryCreator<DBObject, QueryBuilder> {
     @Override
     protected DBObject finalize(QueryBuilder criteria, Sort sort) {
 
-        // TODO: apply sorting
         return criteria.get();
     }
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/SimpleMongoRepository.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/SimpleMongoRepository.java
index 801419abd..31401d3f9 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/SimpleMongoRepository.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/SimpleMongoRepository.java
@@ -48,10 +48,14 @@ public class SimpleMongoRepository<T, ID extends Serializable> extends
 
 
     /**
+     * Creates a ew {@link SimpleMongoRepository} for the given domain class and
+     * {@link MongoOperations}.
+     * 
      * @param domainClass
      * @param operations
      */
-    public SimpleMongoRepository(Class<T> domainClass, MongoOperations operations) {
+    public SimpleMongoRepository(Class<T> domainClass,
+            MongoOperations operations) {
 
         super(domainClass);