diff --git a/src/main/java/com/jolira/gossip/Service.java b/src/main/java/com/jolira/gossip/Service.java
index 4dc62b3..635403a 100644
--- a/src/main/java/com/jolira/gossip/Service.java
+++ b/src/main/java/com/jolira/gossip/Service.java
@@ -7,42 +7,17 @@
 
 package com.jolira.gossip;
 
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.Reader;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.SocketException;
-import java.net.UnknownHostException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Random;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.TreeMap;
-import java.util.UUID;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * A simple Gossip-inspires service.
  *
@@ -118,7 +93,7 @@ private static InetSocketAddress[] unmarshalPeers(final String peers) throws Unk
     private final DatagramSocket socket;
     private final String id = makeID();
 
-    private final Map<Pattern, Listener> listenerByPattern = new TreeMap<Pattern, Listener>();
+    private final Map<Pattern, Listener> listenerByPattern = new HashMap<Pattern, Listener>();
     private final long heartbeat;
     private Semaphore semaphore;