diff --git a/api/api.go b/api/api.go
index 07ce222..d5f8db0 100644
--- a/api/api.go
+++ b/api/api.go
@@ -184,6 +184,6 @@ func accessLogger(param gin.LogFormatterParams) string {
 }
 
 func handleHealthcheck(c *gin.Context) {
-	// TODO: add some actual health checking here
+	// TODO: add some actual health checking here (#337)
 	c.JSON(200, gin.H{"failed": false})
 }
diff --git a/api/api_test.go b/api/api_test.go
index 6b54734..76c60c4 100644
--- a/api/api_test.go
+++ b/api/api_test.go
@@ -37,6 +37,6 @@ func TestRouteRegistration(t *testing.T) {
 	assert.Equal(t, http.StatusNotFound, rr.Code, "Expected status not found")
 
 	// You can also check the response body, headers, etc.
-	// TODO check for JSON response
+	// TODO check for JSON response (#338)
 	// assert.Equal(t, `{"fcmToken":"someToken"}`, rr.Body.String())
 }
diff --git a/filter/chainsync/chainsync.go b/filter/chainsync/chainsync.go
index 30bd5ab..bad820b 100644
--- a/filter/chainsync/chainsync.go
+++ b/filter/chainsync/chainsync.go
@@ -53,7 +53,7 @@ func New(options ...ChainSyncOptionFunc) *ChainSync {
 // Start the chain sync filter
 func (c *ChainSync) Start() error {
 	go func() {
-		// TODO: pre-process filter params to be more useful for direct comparison
+		// TODO: pre-process filter params to be more useful for direct comparison (#336)
 		for {
 			evt, ok := <-c.inputChan
 			// Channel has been closed, which means we're shutting down
diff --git a/filter/event/event.go b/filter/event/event.go
index bc65af9..4374900 100644
--- a/filter/event/event.go
+++ b/filter/event/event.go
@@ -43,7 +43,6 @@ func New(options ...EventOptionFunc) *Event {
 // Start the event filter
 func (e *Event) Start() error {
 	go func() {
-		// TODO: pre-process filter params to be more useful for direct comparison
 		for {
 			evt, ok := <-e.inputChan
 			// Channel has been closed, which means we're shutting down
diff --git a/output/push/fcm_repository.go b/output/push/fcm_repository.go
index 4fc4e2b..c545a44 100644
--- a/output/push/fcm_repository.go
+++ b/output/push/fcm_repository.go
@@ -43,7 +43,7 @@ type ErrorResponse struct {
 	Error string `json:"error"`
 }
 
-// TODO add support for persistence
+// TODO add support for persistence (#335)
 var fcmStore *TokenStore
 
 func init() {
diff --git a/output/webhook/webhook.go b/output/webhook/webhook.go
index 4394b1b..4d8224e 100644
--- a/output/webhook/webhook.go
+++ b/output/webhook/webhook.go
@@ -98,7 +98,7 @@ func (w *WebhookOutput) Start() error {
 				logger.Error(fmt.Sprintf("unknown event type: %s", evt.Type))
 				return
 			}
-			// TODO: error handle
+			// TODO: error handle (#334)
 			err := w.SendWebhook(&evt)
 			if err != nil {
 				logger.Error(fmt.Sprintf("ERROR: %s", err))