diff --git a/pisa/appointment.py b/pisa/appointment.py
index ac1d3a2..816fde6 100644
--- a/pisa/appointment.py
+++ b/pisa/appointment.py
@@ -3,7 +3,7 @@ from pisa.encrypted_blob import EncryptedBlob
 
 # Basic appointment structure
 class Appointment:
-    # TODO: 35-appointment-checks
+    # DISCUSS: 35-appointment-checks
     def __init__(self, locator, start_time, end_time, dispute_delta, encrypted_blob, cipher, hash_function):
         self.locator = locator
         self.start_time = start_time    # ToDo: #4-standardize-appointment-fields
diff --git a/pisa/responder.py b/pisa/responder.py
index 7eabd9b..08f082e 100644
--- a/pisa/responder.py
+++ b/pisa/responder.py
@@ -164,7 +164,7 @@ class Responder:
         return completed_jobs
 
     def rebroadcast(self, jobs_to_rebroadcast):
-        # ToDO: #22-discuss-confirmations-before-retry
+        # DISCUSS: #22-discuss-confirmations-before-retry
         # ToDo: #23-define-behaviour-approaching-end
 
         for tx in jobs_to_rebroadcast:
diff --git a/pisa/watcher.py b/pisa/watcher.py
index f63e5ab..ab8da44 100644
--- a/pisa/watcher.py
+++ b/pisa/watcher.py
@@ -11,10 +11,6 @@ from pisa.block_processor import BlockProcessor
 from pisa.utils.zmq_subscriber import ZMQHandler
 
 
-# WIP: MOVED BLOCKCHAIN RELATED TASKS TO BLOCK PROCESSOR IN AN AIM TO MAKE THE CODE MORE MODULAR. THIS SHOULD HELP
-#      WITH CODE REUSE WHEN MERGING THE DATA PERSISTENCE PART.
-
-
 class Watcher:
     def __init__(self, max_appointments=MAX_APPOINTMENTS):
         self.appointments = dict()
diff --git a/test/unit/test_api.py b/test/unit/test_api.py
index 5742c73..8505bfa 100644
--- a/test/unit/test_api.py
+++ b/test/unit/test_api.py
@@ -124,7 +124,7 @@ def test_request_appointment(new_appointment):
 
 def test_add_appointment_multiple_times(new_appointment, n=MULTIPLE_APPOINTMENTS):
     # Multiple appointments with the same locator should be valid
-    # TODO: #34-store-identical-appointments
+    # DISCUSS: #34-store-identical-appointments
     for _ in range(n):
         r = add_appointment(new_appointment)
         assert (r.status_code == 200)