diff --git a/boswatch/filter/doubeFilter.py b/boswatch/filter/doubeFilter.py
index 066e18d..c230155 100644
--- a/boswatch/filter/doubeFilter.py
+++ b/boswatch/filter/doubeFilter.py
@@ -13,8 +13,7 @@
 @date:        15.01.2018
 @author:      Bastian Schroll
 @description: Class to implement a filter for double alarms
-@todo test, refactor and document
-@todo check_msg is not implemented yet
+@todo test, refactor and document / check_msg is not implemented yet
 """
 import logging
 import time
diff --git a/boswatch/utils/wildcard.py b/boswatch/utils/wildcard.py
index 636b27c..dc0f746 100644
--- a/boswatch/utils/wildcard.py
+++ b/boswatch/utils/wildcard.py
@@ -13,7 +13,6 @@
 @date:        15.01.2018
 @author:      Bastian Schroll
 @description: Little Helper to replace wildcards in stings
-@todo not completed yet
 """
 import logging
 import time
diff --git a/bw_client.py b/bw_client.py
index 29fee0f..530abe5 100644
--- a/bw_client.py
+++ b/bw_client.py
@@ -91,8 +91,7 @@ try:
                     bwPacket.addClientData()
                     bwClient.transmit(str(bwPacket))
 
-                    # todo should we do this in an thread, to not block receiving ???
-                    # todo but then we should use transmit() and receive() with Lock()
+                    # todo should we do this in an thread, to not block receiving ??? but then we should use transmit() and receive() with Lock()
                     failedTransmits = 0
                     while not bwClient.receive() == "[ack]":  # wait for ack or timeout
                         if failedTransmits >= 3: