diff --git a/dexlib/src/main/java/org/jf/dexlib/CodeItem.java b/dexlib/src/main/java/org/jf/dexlib/CodeItem.java
index 68ebd388..8c19a23a 100644
--- a/dexlib/src/main/java/org/jf/dexlib/CodeItem.java
+++ b/dexlib/src/main/java/org/jf/dexlib/CodeItem.java
@@ -309,7 +309,6 @@ public class CodeItem extends Item<CodeItem> {
 
     /** {@inheritDoc} */
     public String getConciseIdentity() {
-        //TODO: should mention the method name here
         return "code_item @0x" + Integer.toHexString(getOffset());
     }
 
@@ -399,6 +398,7 @@ public class CodeItem extends Item<CodeItem> {
      * - Replace const-string instruction with const-string/jumbo, when the string index is too big
      * - Replace goto and goto/16 with a larger version of goto, when the target is too far away
      * TODO: we should be able to replace if-* instructions with targets that are too far away with a negated if followed by a goto/32 to the original target
+     * TODO: remove multiple nops that occur before a switch/array data pseudo instruction. In some cases, multiple smali-baksmali cycles with changes in between could cause nops to start piling up
      *
      * The above fixes are applied iteratively, until no more fixes have been performed
      */