diff --git a/command/agent/command.go b/command/agent/command.go
index e92143370e..ac8409a03f 100644
--- a/command/agent/command.go
+++ b/command/agent/command.go
@@ -304,7 +304,7 @@ WAIT:
 // handleReload is invoked when we should reload our configs, e.g. SIGHUP
 func (c *Command) handleReload(config *Config) *Config {
 	c.Ui.Output("Reloading configuration...")
-	// TODO
+	// TODO : handle reload
 	return config
 }
 
diff --git a/command/agent/config_test.go b/command/agent/config_test.go
index 0fdcf0d8ad..8b2c1f8dd2 100644
--- a/command/agent/config_test.go
+++ b/command/agent/config_test.go
@@ -1,3 +1,3 @@
 package agent
 
-// TODO:
+// TODO: Add tests...
diff --git a/consul/state_store.go b/consul/state_store.go
index 1714e713e6..a263259928 100644
--- a/consul/state_store.go
+++ b/consul/state_store.go
@@ -193,7 +193,6 @@ func (s *StateStore) initialize() error {
 	}
 
 	// Setup the query tables
-	// TODO: Other queries...
 	s.queryTables = map[string]MDBTables{
 		"Nodes":             MDBTables{s.nodeTable},
 		"Services":          MDBTables{s.serviceTable},