diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/EmptyBlockCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/EmptyBlockCheck.java
index af45a0cd5..9ee1e0ba0 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/EmptyBlockCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/EmptyBlockCheck.java
@@ -26,6 +26,11 @@ import com.puppycrawl.tools.checkstyle.api.Check;
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.JavaTokenTypes;
 
+/**
+ * Check that reports empty if/try/catch/finally blocks.
+ *
+ * @author Lars Kühne
+ */
 public class EmptyBlockCheck extends Check
 {
     private final Set mCheckFor = new HashSet();
@@ -59,6 +64,7 @@ public class EmptyBlockCheck extends Check
             DetailAST parent = aAST.getParent();
             String parentText = parent.getText();
             if (mCheckFor.contains(parentText)) {
+                // TODO: i18n
                 log(aAST.getLineNo(), "empty " + parentText + " block");
             }
         }
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ImportCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ImportCheck.java
index 86c04b935..f342df625 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ImportCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ImportCheck.java
@@ -24,7 +24,7 @@ import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.JavaTokenTypes;
 
 /**
- * Abstract
+ * Abstract base class that provides functionality that is used in import checks.
  */
 public abstract class ImportCheck
     extends Check
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/SimplifyBooleanReturnCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/SimplifyBooleanReturnCheck.java
index c23433f17..b4f3f2dd3 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/SimplifyBooleanReturnCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/SimplifyBooleanReturnCheck.java
@@ -26,7 +26,9 @@ import com.puppycrawl.tools.checkstyle.api.DetailAST;
 
 
 /**
- * Checks for overly complicated return
+ * Checks for overly complicated boolean return statements.
+ *
+ * Idea shamelessly stolen from the equivalent PMD rule (pmd.sourceforge.net).
  */
 public class SimplifyBooleanReturnCheck extends Check
 {
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/UnusedImportsCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/UnusedImportsCheck.java
index e27f81d51..068eb47fc 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/UnusedImportsCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/UnusedImportsCheck.java
@@ -27,6 +27,9 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.Iterator;
 
+/**
+ * Checks for unused import statements.
+ */
 public class UnusedImportsCheck extends ImportCheck
 {
     private boolean mCollect;
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java
index a5c662924..5ea4a7083 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java
@@ -27,6 +27,7 @@ public class WhitespaceAroundCheck extends Check
 {
     public int[] getDefaultTokens()
     {
+        // TODO: add all operators
         return new int[] {JavaTokenTypes.ASSIGN};
     }
 
@@ -37,6 +38,7 @@ public class WhitespaceAroundCheck extends Check
         final int before = aAST.getColumnNo() - 1;
         final int after = aAST.getColumnNo() + aAST.getText().length();
 
+        // TODO: i18n
         if ((before >= 0) && !Character.isWhitespace(line.charAt(before))) {
             log(aAST.getLineNo(), "NO LEADING SPACE for " + aAST.getText());
         }