diff --git a/UDP-client-server.py b/UDP-client-server.py
index fbab2a39fffbf11a96f8fb6a3a2339a5604e138a..9ca7b64fe25dce42e12b86bae362e7934ce9fc4e 100755
--- a/UDP-client-server.py
+++ b/UDP-client-server.py
@@ -2,9 +2,9 @@ import socket
 import time
 import sys
 import threading
-from threading import Thread, Timer
+from threading import Thread
 import numpy as np
-from array import *
+import array
 
 # pymongo for MongoDB support
 import pymongo
@@ -17,7 +17,7 @@ DBConPort = 27017
 DBName = 'matningar'
 DBTableName = 'stability'
 
-DBCon = MongoClient(DBConHost, DBConPort)
+DBCon = pymongo.MongoClient(DBConHost, DBConPort)
 DB = DBCon[DBName]
 DBTableStability = DB[DBTableName]
 
@@ -77,6 +77,7 @@ def udp_client_receive(UDP_RECEIVE_IP, UDP_RECEIVE_PORT):
         packet_number = str(splitdata[1].strip("' '"))
         packet_number = packet_number.lstrip('0')
 #WRITE TO FILE AND DO PACKET COUNT
+# Useful for debugging and verification purposes
 #        outfile = open("udp_twoway_results.csv", "a").\
 #            write(str(time.ctime() + ',' + 'received , ' +
 #                      packet_number + ' , ' + str(rt_delay) + '\n'))