diff --git a/src/DidacticNet.cpp b/src/DidacticNet.cpp
index 4aeaf5ef598d3846271a44b431bf9efccee4fe33..49286b15bb843e8cd7913c5db1455b23ca9349e8 100644
--- a/src/DidacticNet.cpp
+++ b/src/DidacticNet.cpp
@@ -43,8 +43,6 @@ bool DidacticPSNet::handleNetwork()
   {
     if (recieveData())
     {
-      // Serial.print("Message filter: ");Serial.println(_readBufferMessage[1]);
-      // Serial.print("Check Message filter: ");Serial.println(getMessageFilter(_readBufferMessage[1]));
       if (getMessageFilter(_readBufferMessage[1]))
       {
         handleData();
@@ -67,8 +65,7 @@ bool DidacticPSNet::handleNetwork()
       else
       {
         _dataToSend = false;
-        //_waitingTime = millis()+ random(CSMA_MID_DELAY_MS, CSMA_MAX_DELAY_MS);
-        _waitingTimeSend = millis() + _intervalTime; // random(CSMA_MID_DELAY_MS, CSMA_MAX_DELAY_MS);
+        _waitingTimeSend = millis() + _intervalTime;
       }
     }
   }
@@ -431,10 +428,10 @@ bool DidacticPSNetClient::handleData()
     if (currentTopicNr >= 0)
     {
       savePayload(_bufferPayload, currentTopicNr);
-      _newMessageAvailable = true;         // new
-      _newMessageTopicNr = currentTopicNr; // new
+      _newMessageAvailable = true;
+      _newMessageTopicNr = currentTopicNr;
 
-      if (_clientMode == CLIENT_MODE_ADVANCED) // new -> client with callback
+      if (_clientMode == CLIENT_MODE_ADVANCED)
       {
 #ifdef CALLBACK_W_LENGTH
         callback(_bufferTopic, topicLength, _bufferPayload, payloadLength);
@@ -613,18 +610,18 @@ int DidacticPSNetBroker::getFreeTopicNr()
   return -1;
 }
 
-void DidacticPSNetBroker::setVerbose(Stream &verbosePort) // TEST: new & untested
+void DidacticPSNetBroker::setVerbose(Stream &verbosePort)
 {
   _isVerbose = true;
   _verbosePort = &verbosePort;
 }
 
-void DidacticPSNetBroker::setNoneVerbose() // TEST: new & untested
+void DidacticPSNetBroker::setNoneVerbose()
 {
   _isVerbose = false;
 }
 
-bool DidacticPSNetBroker::printVerbose(char *recievedData) // TEST: new & untested
+bool DidacticPSNetBroker::printVerbose(char *recievedData)
 {
   char signBuffer = 0;
   int signCounter = 0;
diff --git a/src/DidacticNet.h b/src/DidacticNet.h
index 5812f7ac044dc029bcc403e155731371b776840f..38643b451cf2a29f8ef6c8d633e54f54bd23c501 100644
--- a/src/DidacticNet.h
+++ b/src/DidacticNet.h
@@ -173,11 +173,11 @@ private:
 	char _topic[MAX_NR_TOPICS_CLIENT][MAX_LEN_TOPICS + 1] = {{0}};
 	char _payload[MAX_NR_TOPICS_CLIENT][MAX_LEN_PAYLOAD + 1] = {{0}};
 
-	bool _clientMode = CLIENT_MODE_ADVANCED; // new
+	bool _clientMode = CLIENT_MODE_ADVANCED;
 	bool _newMessageAvailable = false;
-	int _newMessageTopicNr = 0;						 // new
-	char _currentTopic[MAX_LEN_TOPICS + 1] = {0};	 // new
-	char _currentPayload[MAX_LEN_PAYLOAD + 1] = {0}; // new
+	int _newMessageTopicNr = 0;
+	char _currentTopic[MAX_LEN_TOPICS + 1] = {0};
+	char _currentPayload[MAX_LEN_PAYLOAD + 1] = {0};
 
 	bool savePayload(char *, int);
 	bool getMessageFilter(char);
@@ -192,18 +192,18 @@ public:
 	DidacticPSNetClient();
 	~DidacticPSNetClient();
 
-	void begin(Stream &_port); // new
+	void begin(Stream &_port);
 	void begin(Stream &_port, PSNET_CALLBACK_SIGNATURE);
 
-	bool available();				  // new
-	int readLatestTopicNr();		  // new
-	void readTopic(char *);			  // new
-	void readTopic(int, char *);	  // new
-	void readPayload(char *);		  // new
-	void readPayload(int, char *);	  // new
-	void readPayload(char *, char *); // new
-	bool readBooleanPayload();		  // new
-	int readIntegerPayload();		  // new
+	bool available();
+	int readLatestTopicNr();
+	void readTopic(char *);
+	void readTopic(int, char *);
+	void readPayload(char *);
+	void readPayload(int, char *);
+	void readPayload(char *, char *);
+	bool readBooleanPayload();
+	int readIntegerPayload();
 
 	int getMaxNrTopics();
 	int getSubscribedTopic(char *, int);
@@ -235,15 +235,15 @@ private:
 	bool handleData();
 	int getTopicNr(char *);
 	int getFreeTopicNr();
-	bool update(char *, int, char *, int); // TEST: moved from public
-	bool printVerbose(char *);			   // TEST: new & untested
+	bool update(char *, int, char *, int);
+	bool printVerbose(char *);
 
 public:
 	DidacticPSNetBroker();
 	~DidacticPSNetBroker();
 
-	void setVerbose(Stream &_port); // TEST: new & untested
-	void setNoneVerbose();			// TEST: new & untested
+	void setVerbose(Stream &_port);
+	void setNoneVerbose();
 };
 
 #endif