diff --git a/src/main/java/com/ctc/wstx/sr/AttributeCollector.java b/src/main/java/com/ctc/wstx/sr/AttributeCollector.java
index a0b5e1f4..6ab5e809 100644
--- a/src/main/java/com/ctc/wstx/sr/AttributeCollector.java
+++ b/src/main/java/com/ctc/wstx/sr/AttributeCollector.java
@@ -753,7 +753,6 @@ public ElemAttrs buildAttrOb()
          */
         int amapLen = mAttrMap.length;
         int[] amap = new int[amapLen];
-        // TODO: JDK 1.6 has Arrays.copyOf(), should use with Woodstox 6
         System.arraycopy(mAttrMap, 0, amap, 0, amapLen);
         return new ElemAttrs(raw, mNonDefCount,
                              amap, mAttrHashSize, mAttrSpillEnd);
diff --git a/src/main/java/com/ctc/wstx/sr/TypedStreamReader.java b/src/main/java/com/ctc/wstx/sr/TypedStreamReader.java
index 9e1f91e4..227919ce 100644
--- a/src/main/java/com/ctc/wstx/sr/TypedStreamReader.java
+++ b/src/main/java/com/ctc/wstx/sr/TypedStreamReader.java
@@ -370,7 +370,7 @@ public final int readElementAsArray(TypedArrayDecoder dec)
             while (true) {
                 type = next();
                 if (type == END_ELEMENT) {
-                    // Simple... no textul content
+                    // Simple... no textual content
                     return -1;
                 }
                 if (type == COMMENT || type == PROCESSING_INSTRUCTION) {
diff --git a/src/main/java/com/ctc/wstx/util/StringVector.java b/src/main/java/com/ctc/wstx/util/StringVector.java
index bd42f7ef..c83067cd 100644
--- a/src/main/java/com/ctc/wstx/util/StringVector.java
+++ b/src/main/java/com/ctc/wstx/util/StringVector.java
@@ -1,7 +1,7 @@
 package com.ctc.wstx.util;
 
 /**
- * Data container similar {@link java.util.List} (from storage perspective),
+ * Data container similar to {@link java.util.List} (from storage perspective),
  * but that can be used in multiple ways. For some uses it acts more like
  * type-safe String list/vector; for others as order associative list of
  * String-to-String mappings.
diff --git a/src/test/java/stax2/stream/TestReaderConstruction.java b/src/test/java/stax2/stream/TestReaderConstruction.java
index 1847d2f3..0385441f 100644
--- a/src/test/java/stax2/stream/TestReaderConstruction.java
+++ b/src/test/java/stax2/stream/TestReaderConstruction.java
@@ -86,11 +86,11 @@ public void testCreateWithByteArraySource()
 	    byte[] b = orig.clone();
         verifyXML(ifact.createXMLStreamReader(new Stax2ByteArraySource(b, 0, b.length)), "ByteArraySource");
 
-	// Also: let's check that non-0 offset works...
-	final int OFFSET = 29;
-	final int DOCLEN  = b.length;
-	byte[] b2 = new byte[OFFSET + DOCLEN + 50];
-	System.arraycopy(b, 0, b2, OFFSET, DOCLEN);
+        // Also: let's check that non-0 offset works...
+        final int OFFSET = 29;
+        final int DOCLEN  = b.length;
+        byte[] b2 = new byte[OFFSET + DOCLEN + 50];
+        System.arraycopy(b, 0, b2, OFFSET, DOCLEN);
         verifyXML(ifact.createXMLStreamReader(new Stax2ByteArraySource(b2, OFFSET, DOCLEN)), "ByteArraySource");
     }