diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index 7e298012..949e2920 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -167,17 +167,16 @@ Command.prototype.hasName = function(name)
 
 Command.prototype.toString = function()
 {
-    // FIXME: -- djk
     return "Command {" +
-         "\nname: " + this.name +
-         "\nnames: " + this.names +
-         "\nshort_names: " + this.short_names  +
-         "\nlong_names: " + this.long_names +
-         "\nusage: " + this.usage +
-         "\nshort_help: " + this.short_help +
-         "\nhelp: " + this.help +
-         "\naction: " + this.action +
-         "\ncompleter: " + this.completer +
+         "\n\tname: " + this.name +
+         "\n\tnames: " + this.names +
+         "\n\tshort_names: " + this.short_names  +
+         "\n\tlong_names: " + this.long_names +
+         "\n\tusage: " + this.usage +
+         "\n\tshort_help: " + this.short_help +
+         "\n\thelp: " + this.help +
+         "\n\taction: " + this.action +
+         "\n\tcompleter: " + this.completer +
          "\n}"
 }
 
diff --git a/chrome/content/vimperator/mappings.js b/chrome/content/vimperator/mappings.js
index b92d0674..910e7133 100644
--- a/chrome/content/vimperator/mappings.js
+++ b/chrome/content/vimperator/mappings.js
@@ -46,7 +46,6 @@ Map.prototype.execute = function(motion, count, argument)
 
 Map.prototype.toString = function()
 {
-    // FIXME: -- djk
     return "Map {" +
         "\n\tmode: " + this.mode +
         "\n\tnames: " + this.names +