diff --git a/server/Event.py b/server/Event.py
index 7aa13a5..6318955 100644
--- a/server/Event.py
+++ b/server/Event.py
@@ -62,8 +62,6 @@ class Event(object):
 	except Queue.Full, e:
 	    Logger.log("Dns Queue overrun, drop event for %s" % str(entry))
 
-                    
-
     def __str__(self):
         if not self.prepared:
             self.prepare()
diff --git a/server/XmlRpcReceiver.py b/server/XmlRpcReceiver.py
index 0f87b8f..50cfbb2 100644
--- a/server/XmlRpcReceiver.py
+++ b/server/XmlRpcReceiver.py
@@ -2,9 +2,9 @@ import threading
 import time
 import Event
 from logger import Logger
+from SimpleXMLRPCServer import SimpleXMLRPCServer
 
-
-class MathServer(SimpleXMLRPCServer):
+class XmlRpcServer(SimpleXMLRPCServer):
     def _dispatch(self, method, params):
         try:
             # We are forcing the 'export_' prefix on methods that are
@@ -28,6 +28,6 @@ class XmlRpcReceiver(threading.Thread):
         self.setDaemon(True)
 
     def run(self):
-	server = MathServer(self.xmlRpcAddr)
+	server = XmlRpcServer(self.xmlRpcAddr)
 	server.serve_forever()