diff --git a/src/ddcon.d b/src/ddcon.d
index 367ce60..2d85d50 100644
--- a/src/ddcon.d
+++ b/src/ddcon.d
@@ -18,8 +18,6 @@
 	private enum CTRL_PRESSED = RIGHT_CTRL_PRESSED | LEFT_CTRL_PRESSED;
 	private enum DEFAULT_COLOR =
 		FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED;
-	/// Necessary handles.
-	//TODO: Get external handles from C runtime instead if possible
 	private __gshared HANDLE hIn, hOut;
 	private __gshared USHORT defaultColor = DEFAULT_COLOR;
 }
diff --git a/src/main.d b/src/main.d
index 9a8fb12..2279451 100644
--- a/src/main.d
+++ b/src/main.d
@@ -11,8 +11,7 @@
 
 private:
 
-//TODO: CLI SWITCHES
-// --dump: Dump to stdout
+//TODO: --dump: Dump to stdout
 
 void handleOptWidth(string, string val) {
 	if (ddhx_setting_width(val))
@@ -70,7 +69,7 @@
 			if (optShort)
 				writefln("%s, %-12s %s", optShort, optLong, help);
 			else
-				writefln("%-15s %s", optLong, help);
+				writefln("%-16s %s", optLong, help);
 		}
 		return 0;
 	}
diff --git a/src/searcher.d b/src/searcher.d
index 74dba69..2f44931 100644
--- a/src/searcher.d
+++ b/src/searcher.d
@@ -158,8 +158,6 @@
 }
 
 private void search_sample(ref search_settings_t s, void *data, ulong len) {
-	//TODO: Use D_SIMD
-	
 	s.data.p = data;
 	s.data.len = len;