diff --git a/source/org/jivesoftware/smack/AccountManager.java b/source/org/jivesoftware/smack/AccountManager.java
index 7fb515d7b..5a0ebfb17 100644
--- a/source/org/jivesoftware/smack/AccountManager.java
+++ b/source/org/jivesoftware/smack/AccountManager.java
@@ -20,12 +20,18 @@
 
 package org.jivesoftware.smack;
 
-import org.jivesoftware.smack.packet.Registration;
+import org.jivesoftware.smack.filter.AndFilter;
+import org.jivesoftware.smack.filter.PacketFilter;
+import org.jivesoftware.smack.filter.PacketIDFilter;
+import org.jivesoftware.smack.filter.PacketTypeFilter;
 import org.jivesoftware.smack.packet.IQ;
-import org.jivesoftware.smack.filter.*;
+import org.jivesoftware.smack.packet.Registration;
 import org.jivesoftware.smack.util.StringUtils;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 
 /**
  * Allows creation and management of accounts on an XMPP server.
@@ -90,17 +96,19 @@ public class AccountManager {
      *
      * @return the required account attributes.
      */
-    public Iterator getAccountAttributes() {
+    public Iterator<String> getAccountAttributes() {
         try {
             if (info == null) {
                 getRegistrationInfo();
             }
-            Map attributes = info.getAttributes();
+            Map<String, String> attributes = info.getAttributes();
             if (attributes != null) {
                 return attributes.keySet().iterator();
             }
         }
-        catch (XMPPException xe) { }
+        catch (XMPPException xe) {
+            xe.printStackTrace();
+        }
         return Collections.EMPTY_LIST.iterator();
     }
 
@@ -117,9 +125,11 @@ public class AccountManager {
             if (info == null) {
                 getRegistrationInfo();
             }
-            return (String) info.getAttributes().get(name);
+            return info.getAttributes().get(name);
+        }
+        catch (XMPPException xe) {
+            xe.printStackTrace();
         }
-        catch (XMPPException xe) { }
         return null;
     }
 
@@ -159,9 +169,9 @@ public class AccountManager {
             throw new XMPPException("Server does not support account creation.");
         }
         // Create a map for all the required attributes, but give them blank values.
-        Map attributes = new HashMap();
-        for (Iterator i=getAccountAttributes(); i.hasNext(); ) {
-            String attributeName = (String)i.next();
+        Map<String, String> attributes = new HashMap<String, String>();
+        for (Iterator<String> i=getAccountAttributes(); i.hasNext(); ) {
+            String attributeName = i.next();
             attributes.put(attributeName, "");
         }
         createAccount(username, password, attributes);
@@ -178,7 +188,7 @@ public class AccountManager {
      * @throws XMPPException if an error occurs creating the account.
      * @see #getAccountAttributes()
      */
-    public void createAccount(String username, String password, Map attributes)
+    public void createAccount(String username, String password, Map<String, String> attributes)
             throws XMPPException
     {
         if (!supportsAccountCreation()) {
@@ -217,7 +227,7 @@ public class AccountManager {
         Registration reg = new Registration();
         reg.setType(IQ.Type.SET);
         reg.setTo(connection.getServiceName());
-        HashMap map = new HashMap();
+        Map<String, String> map = new HashMap<String, String>();
         map.put("username",StringUtils.parseName(connection.getUser()));
         map.put("password",newPassword);
         reg.setAttributes(map);
@@ -251,7 +261,7 @@ public class AccountManager {
         Registration reg = new Registration();
         reg.setType(IQ.Type.SET);
         reg.setTo(connection.getServiceName());
-        Map attributes = new HashMap();
+        Map<String, String> attributes = new HashMap<String, String>();
         // To delete an account, we add a single attribute, "remove", that is blank.
         attributes.put("remove", "");
         reg.setAttributes(attributes);
diff --git a/source/org/jivesoftware/smack/Chat.java b/source/org/jivesoftware/smack/Chat.java
index 57e1633e4..b82c91e30 100644
--- a/source/org/jivesoftware/smack/Chat.java
+++ b/source/org/jivesoftware/smack/Chat.java
@@ -20,12 +20,15 @@
 
 package org.jivesoftware.smack;
 
+import org.jivesoftware.smack.filter.PacketFilter;
+import org.jivesoftware.smack.filter.ThreadFilter;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.util.StringUtils;
-import org.jivesoftware.smack.filter.*;
 
-import java.util.*;
 import java.lang.ref.WeakReference;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 
 /**
  * A chat is a series of messages sent between two users. Each chat has a unique
@@ -66,7 +69,8 @@ public class Chat {
     private String participant;
     private PacketFilter messageFilter;
     private PacketCollector messageCollector;
-    private Set listeners = new HashSet();
+    private final Set<WeakReference<PacketListener>> listeners =
+            new HashSet<WeakReference<PacketListener>>();
 
     /**
      * Creates a new chat with the specified user.
@@ -94,7 +98,7 @@ public class Chat {
         // Register with the map of chats so that messages with no thread ID
         // set will be delivered to this Chat.
         connection.chats.put(StringUtils.parseBareAddress(participant),
-                new WeakReference(this));
+                new WeakReference<Chat>(this));
 
         // Filter the messages whose thread equals Chat's id
         messageFilter = new ThreadFilter(threadID);
@@ -222,7 +226,7 @@ public class Chat {
         // Keep track of the listener so that we can manually deliver extra
         // messages to it later if needed.
         synchronized (listeners) {
-            listeners.add(new WeakReference(listener));
+            listeners.add(new WeakReference<PacketListener>(listener));
         }
     }
 
@@ -242,10 +246,10 @@ public class Chat {
 
         messageCollector.processPacket(message);
         synchronized (listeners) {
-            for (Iterator i=listeners.iterator(); i.hasNext(); ) {
-                WeakReference listenerRef = (WeakReference)i.next();
+            for (Iterator<WeakReference<PacketListener>> i=listeners.iterator(); i.hasNext(); ) {
+                WeakReference<PacketListener> listenerRef = i.next();
                 PacketListener listener;
-                if ((listener = (PacketListener)listenerRef.get()) != null) {
+                if ((listener = listenerRef.get()) != null) {
                     listener.processPacket(message);
                 }
                 // If the reference was cleared, remove it from the set.
diff --git a/source/org/jivesoftware/smack/ConnectionConfiguration.java b/source/org/jivesoftware/smack/ConnectionConfiguration.java
index 7e4b3d7c6..bdb3e617a 100644
--- a/source/org/jivesoftware/smack/ConnectionConfiguration.java
+++ b/source/org/jivesoftware/smack/ConnectionConfiguration.java
@@ -62,7 +62,7 @@ public class ConnectionConfiguration implements Cloneable {
         // Build the default path to the cacert truststore file. By default we are
         // going to use the file located in $JREHOME/lib/security/cacerts.
         String javaHome =  System.getProperty("java.home");
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         buffer.append(javaHome).append(File.separator).append("lib");
         buffer.append(File.separator).append("security");
         buffer.append(File.separator).append("cacerts");
diff --git a/source/org/jivesoftware/smack/PacketCollector.java b/source/org/jivesoftware/smack/PacketCollector.java
index 737def22e..3a1733f1b 100644
--- a/source/org/jivesoftware/smack/PacketCollector.java
+++ b/source/org/jivesoftware/smack/PacketCollector.java
@@ -48,7 +48,7 @@ public class PacketCollector {
     private static final int MAX_PACKETS = 65536;
 
     private PacketFilter packetFilter;
-    private LinkedList resultQueue;
+    private LinkedList<Packet> resultQueue;
     private PacketReader packetReader;
     private boolean cancelled = false;
 
@@ -62,7 +62,7 @@ public class PacketCollector {
     protected PacketCollector(PacketReader packetReader, PacketFilter packetFilter) {
         this.packetReader = packetReader;
         this.packetFilter = packetFilter;
-        this.resultQueue = new LinkedList();
+        this.resultQueue = new LinkedList<Packet>();
     }
 
     /**
@@ -101,7 +101,7 @@ public class PacketCollector {
             return null;
         }
         else {
-            return (Packet)resultQueue.removeLast();
+            return resultQueue.removeLast();
         }
     }
 
@@ -121,7 +121,7 @@ public class PacketCollector {
                 // Ignore.
             }
         }
-        return (Packet)resultQueue.removeLast();
+        return resultQueue.removeLast();
     }
 
     /**
@@ -159,12 +159,12 @@ public class PacketCollector {
             }
             // Return the packet that was found.
             else {
-                return (Packet)resultQueue.removeLast();
+                return resultQueue.removeLast();
             }
         }
         // There's already a packet waiting, so return it.
         else {
-            return (Packet)resultQueue.removeLast();
+            return resultQueue.removeLast();
         }
     }
 
diff --git a/source/org/jivesoftware/smack/PacketReader.java b/source/org/jivesoftware/smack/PacketReader.java
index 3cfcf4023..32277ec25 100644
--- a/source/org/jivesoftware/smack/PacketReader.java
+++ b/source/org/jivesoftware/smack/PacketReader.java
@@ -48,9 +48,11 @@ class PacketReader {
     private XMPPConnection connection;
     private XmlPullParser parser;
     private boolean done = false;
-    private final VolatileMemberCollection collectors = new VolatileMemberCollection(50);
+    private final VolatileMemberCollection<PacketCollector> collectors =
+            new VolatileMemberCollection<PacketCollector>(50);
     private final VolatileMemberCollection listeners = new VolatileMemberCollection(50);
-    protected final List connectionListeners = new ArrayList();
+    protected final List<ConnectionListener> connectionListeners =
+            new ArrayList<ConnectionListener>();
 
     private String connectionID = null;
     private final Object connectionIDLock = new Object();
@@ -176,12 +178,11 @@ class PacketReader {
     public void shutdown() {
         // Notify connection listeners of the connection closing if done hasn't already been set.
         if (!done) {
-            ArrayList listenersCopy;
+            List<ConnectionListener> listenersCopy;
             synchronized (connectionListeners) {
                 // Make a copy since it's possible that a listener will be removed from the list
-                listenersCopy = new ArrayList(connectionListeners);
-                for (Iterator i=listenersCopy.iterator(); i.hasNext(); ) {
-                    ConnectionListener listener = (ConnectionListener)i.next();
+                listenersCopy = new ArrayList<ConnectionListener>(connectionListeners);
+                for (ConnectionListener listener : listenersCopy) {
                     listener.connectionClosed();
                 }
             }
@@ -206,12 +207,11 @@ class PacketReader {
         // Print the stack trace to help catch the problem
         e.printStackTrace();
         // Notify connection listeners of the error.
-        ArrayList listenersCopy;
+        List<ConnectionListener> listenersCopy;
         synchronized (connectionListeners) {
             // Make a copy since it's possible that a listener will be removed from the list
-            listenersCopy = new ArrayList(connectionListeners);
-            for (Iterator i=listenersCopy.iterator(); i.hasNext(); ) {
-                ConnectionListener listener = (ConnectionListener)i.next();
+            listenersCopy = new ArrayList<ConnectionListener>(connectionListeners);
+            for (ConnectionListener listener : listenersCopy) {
                 listener.connectionClosedOnError(e);
             }
         }
@@ -489,8 +489,8 @@ class PacketReader {
      * @return a collection of Stings with the mechanisms included in the mechanisms stanza.
      * @throws Exception if an exception occurs while parsing the stanza.
      */
-    private Collection parseMechanisms(XmlPullParser parser) throws Exception {
-        List mechanisms = new ArrayList();
+    private Collection<String> parseMechanisms(XmlPullParser parser) throws Exception {
+        List<String> mechanisms = new ArrayList<String>();
         boolean done = false;
         while (!done) {
             int eventType = parser.next();
@@ -510,9 +510,9 @@ class PacketReader {
         return mechanisms;
     }
 
-    private Collection parseCompressionMethods(XmlPullParser parser)
+    private Collection<String> parseCompressionMethods(XmlPullParser parser)
             throws IOException, XmlPullParserException {
-        List methods = new ArrayList();
+        List<String> methods = new ArrayList<String>();
         boolean done = false;
         while (!done) {
             int eventType = parser.next();
@@ -698,7 +698,7 @@ class PacketReader {
 
      private Registration parseRegistration(XmlPullParser parser) throws Exception {
         Registration registration = new Registration();
-        Map fields = null;
+        Map<String, String> fields = null;
         boolean done = false;
         while (!done) {
             int eventType = parser.next();
@@ -709,7 +709,7 @@ class PacketReader {
                     String name = parser.getName();
                     String value = "";
                     if (fields == null) {
-                        fields = new HashMap();
+                        fields = new HashMap<String, String>();
                     }
 
                     if (parser.next() == XmlPullParser.TEXT) {
@@ -772,19 +772,19 @@ class PacketReader {
      * volatile. In other words, many are added and deleted and 'null' values are skipped by the
      * returned iterator.
      */
-    static class VolatileMemberCollection {
+    static class VolatileMemberCollection<E> {
 
         private final Object mutex = new Object();
-        private final ArrayList collectors;
+        private final ArrayList<E> collectors;
         private int nullIndex = -1;
         private int[] nullArray;
 
         VolatileMemberCollection(int initialCapacity) {
-            collectors = new ArrayList(initialCapacity);
+            collectors = new ArrayList<E>(initialCapacity);
             nullArray = new int[initialCapacity];
         }
 
-        public void add(Object member) {
+        public void add(E member) {
             synchronized (mutex) {
                 if (nullIndex < 0) {
                     ensureCapacity();
@@ -808,7 +808,7 @@ class PacketReader {
             }
         }
 
-        public void remove(Object member) {
+        public void remove(E member) {
             synchronized (mutex) {
                 int index = collectors.lastIndexOf(member);
                 if (index >= 0) {
diff --git a/source/org/jivesoftware/smack/PacketWriter.java b/source/org/jivesoftware/smack/PacketWriter.java
index 93cb37e68..d1c3bb8ec 100644
--- a/source/org/jivesoftware/smack/PacketWriter.java
+++ b/source/org/jivesoftware/smack/PacketWriter.java
@@ -41,10 +41,10 @@ class PacketWriter {
     private Thread writerThread;
     private Writer writer;
     private XMPPConnection connection;
-    final private LinkedList queue;
+    final private LinkedList<Packet> queue;
     private boolean done = false;
     
-    final private List listeners = new ArrayList();
+    final private List<ListenerWrapper> listeners = new ArrayList<ListenerWrapper>();
     private boolean listenersDeleted = false;
 
     /**
@@ -72,7 +72,7 @@ class PacketWriter {
     protected PacketWriter(XMPPConnection connection) {
         this.connection = connection;
         this.writer = connection.writer;
-        this.queue = new LinkedList();
+        this.queue = new LinkedList<Packet>();
 
         writerThread = new Thread() {
             public void run() {
@@ -130,7 +130,7 @@ class PacketWriter {
     public void removePacketListener(PacketListener packetListener) {
         synchronized (listeners) {
             for (int i=0; i<listeners.size(); i++) {
-                ListenerWrapper wrapper = (ListenerWrapper)listeners.get(i);
+                ListenerWrapper wrapper = listeners.get(i);
                 if (wrapper != null && wrapper.packetListener.equals(packetListener)) {
                     listeners.set(i, null);
                     // Set the flag to indicate that the listener list needs
@@ -239,7 +239,7 @@ class PacketWriter {
                 }
             }
             if (queue.size() > 0) {
-                return (Packet)queue.removeLast();
+                return queue.removeLast();
             }
             else {
                 return null;
@@ -308,7 +308,7 @@ class PacketWriter {
         // Notify the listeners of the new sent packet
         int size = listeners.size();
         for (int i=0; i<size; i++) {
-            ListenerWrapper listenerWrapper = (ListenerWrapper)listeners.get(i);
+            ListenerWrapper listenerWrapper = listeners.get(i);
             if (listenerWrapper != null) {
                 listenerWrapper.notifyListener(packet);
             }
@@ -357,7 +357,7 @@ class PacketWriter {
      * @throws IOException If an error occurs while sending the stanza to the server.
      */
     void openStream() throws IOException {
-        StringBuffer stream = new StringBuffer();
+        StringBuilder stream = new StringBuilder();
         stream.append("<stream:stream");
         stream.append(" to=\"").append(connection.serviceName).append("\"");
         stream.append(" xmlns=\"jabber:client\"");
diff --git a/source/org/jivesoftware/smack/Roster.java b/source/org/jivesoftware/smack/Roster.java
index 8dac38930..23ee8d7b9 100644
--- a/source/org/jivesoftware/smack/Roster.java
+++ b/source/org/jivesoftware/smack/Roster.java
@@ -20,8 +20,13 @@
 
 package org.jivesoftware.smack;
 
-import org.jivesoftware.smack.packet.*;
-import org.jivesoftware.smack.filter.*;
+import org.jivesoftware.smack.filter.PacketFilter;
+import org.jivesoftware.smack.filter.PacketIDFilter;
+import org.jivesoftware.smack.filter.PacketTypeFilter;
+import org.jivesoftware.smack.packet.IQ;
+import org.jivesoftware.smack.packet.Packet;
+import org.jivesoftware.smack.packet.Presence;
+import org.jivesoftware.smack.packet.RosterPacket;
 import org.jivesoftware.smack.util.StringUtils;
 
 import java.util.*;
@@ -63,17 +68,17 @@ public class Roster {
     public static final int SUBSCRIPTION_MANUAL = 2;
 
     /**
-     * The default subscription processing mode to use when a Roster is created. By default 
-     * all subscription requests are automatically accepted. 
+     * The default subscription processing mode to use when a Roster is created. By default
+     * all subscription requests are automatically accepted.
      */
     private static int defaultSubscriptionMode = SUBSCRIPTION_ACCEPT_ALL;
 
     private XMPPConnection connection;
-    private Map<String,RosterGroup> groups;
-    private List entries;
-    private List unfiledEntries;
-    private List<RosterListener> rosterListeners;
-    private Map presenceMap;
+    private final Map<String, RosterGroup> groups;
+    private final List<RosterEntry> entries;
+    private final List<RosterEntry> unfiledEntries;
+    private final List<RosterListener> rosterListeners;
+    private Map<String, Map<String, Presence>> presenceMap;
     // The roster is marked as initialized when at least a single roster packet
     // has been recieved and processed.
     boolean rosterInitialized = false;
@@ -81,11 +86,11 @@ public class Roster {
     private int subscriptionMode = getDefaultSubscriptionMode();
 
     /**
-     * Returns the default subscription processing mode to use when a new Roster is created. The 
-     * subscription processing mode dictates what action Smack will take when subscription 
-     * requests from other users are made. The default subscription mode 
+     * Returns the default subscription processing mode to use when a new Roster is created. The
+     * subscription processing mode dictates what action Smack will take when subscription
+     * requests from other users are made. The default subscription mode
      * is {@link #SUBSCRIPTION_ACCEPT_ALL}.
-     * 
+     *
      * @return the default subscription mode to use for new Rosters
      */
     public static int getDefaultSubscriptionMode() {
@@ -93,9 +98,9 @@ public class Roster {
     }
 
     /**
-     * Sets the default subscription processing mode to use when a new Roster is created. The 
-     * subscription processing mode dictates what action Smack will take when subscription 
-     * requests from other users are made. The default subscription mode 
+     * Sets the default subscription processing mode to use when a new Roster is created. The
+     * subscription processing mode dictates what action Smack will take when subscription
+     * requests from other users are made. The default subscription mode
      * is {@link #SUBSCRIPTION_ACCEPT_ALL}.
      *
      * @param subscriptionMode the default subscription mode to use for new Rosters.
@@ -112,10 +117,10 @@ public class Roster {
     Roster(final XMPPConnection connection) {
         this.connection = connection;
         groups = new ConcurrentHashMap<String,RosterGroup>();
-        unfiledEntries = new ArrayList();
-        entries = new ArrayList();
+        unfiledEntries = new ArrayList<RosterEntry>();
+        entries = new ArrayList<RosterEntry>();
         rosterListeners = new ArrayList<RosterListener>();
-        presenceMap = new HashMap();
+        presenceMap = new HashMap<String, Map<String, Presence>>();
         // Listen for any roster packets.
         PacketFilter rosterFilter = new PacketTypeFilter(RosterPacket.class);
         connection.addPacketListener(new RosterPacketListener(), rosterFilter);
@@ -230,9 +235,9 @@ public class Roster {
         rosterPacket.setType(IQ.Type.SET);
         RosterPacket.Item item = new RosterPacket.Item(user, name);
         if (groups != null) {
-            for (int i=0; i<groups.length; i++) {
-                if (groups[i] != null) {
-                    item.addGroupName(groups[i]);
+            for (String group : groups) {
+                if (group != null) {
+                    item.addGroupName(group);
                 }
             }
         }
@@ -258,7 +263,7 @@ public class Roster {
     }
 
     /**
-     * Removes a roster entry from the roster. The roster entry will also be removed from the 
+     * Removes a roster entry from the roster. The roster entry will also be removed from the
      * unfiled entries or from any roster group where it could belong and will no longer be part
      * of the roster. Note that this is an asynchronous call -- Smack must wait for the server
      * to send an updated subscription status.
@@ -342,9 +347,10 @@ public class Roster {
      *
      * @return an iterator the unfiled roster entries.
      */
-    public Iterator getUnfiledEntries() {
+    public Iterator<RosterEntry> getUnfiledEntries() {
         synchronized (unfiledEntries) {
-            return Collections.unmodifiableList(new ArrayList(unfiledEntries)).iterator();
+            return Collections.unmodifiableList(new ArrayList<RosterEntry>(unfiledEntries))
+                    .iterator();
         }
     }
 
@@ -362,8 +368,7 @@ public class Roster {
         }
         String userLowerCase = user.toLowerCase();
         synchronized (entries) {
-            for (Iterator i=entries.iterator(); i.hasNext(); ) {
-                RosterEntry entry = (RosterEntry)i.next();
+            for (RosterEntry entry : entries) {
                 if (entry.getUser().equals(userLowerCase)) {
                     return entry;
                 }
@@ -435,19 +440,19 @@ public class Roster {
      */
     public Presence getPresence(String user) {
         String key = getPresenceMapKey(user);
-        Map userPresences = (Map) presenceMap.get(key);
+        Map<String, Presence> userPresences = presenceMap.get(key);
         if (userPresences == null) {
             return null;
         }
         else {
             // Find the resource with the highest priority
             // Might be changed to use the resource with the highest availability instead.
-            Iterator it = userPresences.keySet().iterator();
+            Iterator<String> it = userPresences.keySet().iterator();
             Presence p;
             Presence presence = null;
 
             while (it.hasNext()) {
-                p = (Presence) userPresences.get(it.next());
+                p = userPresences.get(it.next());
                 if (presence == null) {
                     presence = p;
                 }
@@ -473,12 +478,12 @@ public class Roster {
     public Presence getPresenceResource(String userResource) {
         String key = getPresenceMapKey(userResource);
         String resource = StringUtils.parseResource(userResource);
-        Map userPresences = (Map)presenceMap.get(key);
+        Map<String, Presence> userPresences = presenceMap.get(key);
         if (userPresences == null) {
             return null;
         }
         else {
-            return (Presence) userPresences.get(resource);
+            return userPresences.get(resource);
         }
     }
 
@@ -492,15 +497,15 @@ public class Roster {
      *      or <tt>null</tt> if the user is unavailable or if no presence information
      *      is available.
      */
-    public Iterator getPresences(String user) {
+    public Iterator<Presence> getPresences(String user) {
         String key = getPresenceMapKey(user);
-        Map userPresences = (Map)presenceMap.get(key);
+        Map<String, Presence> userPresences = presenceMap.get(key);
         if (userPresences == null) {
             return null;
         }
         else {
             synchronized (userPresences) {
-                return new HashMap(userPresences).values().iterator();
+                return new HashMap<String, Presence>(userPresences).values().iterator();
             }
         }
     }
@@ -543,15 +548,15 @@ public class Roster {
             listeners = new RosterListener[rosterListeners.size()];
             rosterListeners.toArray(listeners);
         }
-        for (int i=0; i<listeners.length; i++) {
+        for (RosterListener listener : listeners) {
             if (!addedEntries.isEmpty()) {
-                listeners[i].entriesAdded(addedEntries);
+                listener.entriesAdded(addedEntries);
             }
             if (!updatedEntries.isEmpty()) {
-                listeners[i].entriesUpdated(updatedEntries);
+                listener.entriesUpdated(updatedEntries);
             }
             if (!deletedEntries.isEmpty()) {
-                listeners[i].entriesDeleted(deletedEntries);
+                listener.entriesDeleted(deletedEntries);
             }
         }
     }
@@ -565,8 +570,8 @@ public class Roster {
             listeners = new RosterListener[rosterListeners.size()];
             rosterListeners.toArray(listeners);
         }
-        for (int i=0; i<listeners.length; i++) {
-            listeners[i].presenceChanged(user);
+        for (RosterListener listener : listeners) {
+            listener.presenceChanged(user);
         }
     }
 
@@ -582,14 +587,14 @@ public class Roster {
             // If an "available" packet, add it to the presence map. Each presence map will hold
             // for a particular user a map with the presence packets saved for each resource.
             if (presence.getType() == Presence.Type.available) {
-                Map userPresences;
+                Map<String, Presence> userPresences;
                 // Get the user presence map
                 if (presenceMap.get(key) == null) {
-                    userPresences = new HashMap();
+                    userPresences = new HashMap<String, Presence>();
                     presenceMap.put(key, userPresences);
                 }
                 else {
-                    userPresences = (Map)presenceMap.get(key);
+                    userPresences = presenceMap.get(key);
                 }
                 // Add the new presence, using the resources as a key.
                 synchronized (userPresences) {
@@ -597,8 +602,7 @@ public class Roster {
                 }
                 // If the user is in the roster, fire an event.
                 synchronized (entries) {
-                    for (Iterator i = entries.iterator(); i.hasNext();) {
-                        RosterEntry entry = (RosterEntry) i.next();
+                    for (RosterEntry entry : entries) {
                         if (entry.getUser().equals(key)) {
                             fireRosterPresenceEvent(from);
                         }
@@ -608,7 +612,7 @@ public class Roster {
             // If an "unavailable" packet, remove any entries in the presence map.
             else if (presence.getType() == Presence.Type.unavailable) {
                 if (presenceMap.get(key) != null) {
-                    Map userPresences = (Map) presenceMap.get(key);
+                    Map<String, Presence> userPresences = presenceMap.get(key);
                     synchronized (userPresences) {
                         userPresences.remove(StringUtils.parseResource(from));
                     }
@@ -618,8 +622,7 @@ public class Roster {
                 }
                 // If the user is in the roster, fire an event.
                 synchronized (entries) {
-                    for (Iterator i=entries.iterator(); i.hasNext(); ) {
-                        RosterEntry entry = (RosterEntry)i.next();
+                    for (RosterEntry entry : entries) {
                         if (entry.getUser().equals(key)) {
                             fireRosterPresenceEvent(from);
                         }
@@ -663,11 +666,11 @@ public class Roster {
         public void processPacket(Packet packet) {
             // Keep a registry of the entries that were added, deleted or updated. An event
             // will be fired for each affected entry
-            Collection addedEntries = new ArrayList();
-            Collection updatedEntries = new ArrayList();
-            Collection deletedEntries = new ArrayList();
+            Collection<String> addedEntries = new ArrayList<String>();
+            Collection<String> updatedEntries = new ArrayList<String>();
+            Collection<String> deletedEntries = new ArrayList<String>();
 
-            RosterPacket rosterPacket = (RosterPacket)packet;
+            RosterPacket rosterPacket = (RosterPacket) packet;
             for (RosterPacket.Item item : rosterPacket.getRosterItems()) {
                 RosterEntry entry = new RosterEntry(item.getUser(), item.getName(),
                         item.getItemType(), item.getItemStatus(), connection);
@@ -701,8 +704,7 @@ public class Roster {
                     }
                     else {
                         // If the entry was in then list then update its state with the new values
-                        RosterEntry existingEntry =
-                            (RosterEntry) entries.get(entries.indexOf(entry));
+                        RosterEntry existingEntry = entries.get(entries.indexOf(entry));
                         existingEntry
                                 .updateState(entry.getName(), entry.getType(), entry.getStatus());
                         // Keep note that an entry has been updated
@@ -752,15 +754,14 @@ public class Roster {
                     // We have the list of old and new group names. We now need to
                     // remove the entry from the all the groups it may no longer belong
                     // to. We do this by subracting the new group set from the old.
-                    for (int m=0; m<newGroupNames.size(); m++) {
-                        currentGroupNames.remove(newGroupNames.get(m));
+                    for (String newGroupName : newGroupNames) {
+                        currentGroupNames.remove(newGroupName);
                     }
                 }
 
                 // Loop through any groups that remain and remove the entries.
                 // This is neccessary for the case of remote entry removals.
-                for (int n=0; n<currentGroupNames.size(); n++) {
-                    String groupName = (String)currentGroupNames.get(n);
+                for (String groupName : currentGroupNames) {
                     RosterGroup group = getGroup(groupName);
                     group.removeEntryLocal(entry);
                     if (group.getEntryCount() == 0) {
diff --git a/source/org/jivesoftware/smack/RosterEntry.java b/source/org/jivesoftware/smack/RosterEntry.java
index 59b78a35f..bb60bc261 100644
--- a/source/org/jivesoftware/smack/RosterEntry.java
+++ b/source/org/jivesoftware/smack/RosterEntry.java
@@ -20,8 +20,8 @@
 
 package org.jivesoftware.smack;
 
-import org.jivesoftware.smack.packet.RosterPacket;
 import org.jivesoftware.smack.packet.IQ;
+import org.jivesoftware.smack.packet.RosterPacket;
 
 import java.util.*;
 
@@ -146,7 +146,7 @@ public class RosterEntry {
     }
 
     public String toString() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         if (name != null) {
             buf.append(name).append(": ");
         }
diff --git a/source/org/jivesoftware/smack/RosterGroup.java b/source/org/jivesoftware/smack/RosterGroup.java
index d366378db..b37c7bf5f 100644
--- a/source/org/jivesoftware/smack/RosterGroup.java
+++ b/source/org/jivesoftware/smack/RosterGroup.java
@@ -20,12 +20,15 @@
 
 package org.jivesoftware.smack;
 
-import org.jivesoftware.smack.packet.RosterPacket;
-import org.jivesoftware.smack.packet.IQ;
-import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.filter.PacketIDFilter;
+import org.jivesoftware.smack.packet.IQ;
+import org.jivesoftware.smack.packet.RosterPacket;
+import org.jivesoftware.smack.util.StringUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * A group of roster entries.
@@ -37,7 +40,7 @@ public class RosterGroup {
 
     private String name;
     private XMPPConnection connection;
-    private List<RosterEntry> entries;
+    private final List<RosterEntry> entries;
 
     /**
      * Creates a new roster group instance.
@@ -70,10 +73,9 @@ public class RosterGroup {
      */
     public void setName(String name) {
         synchronized (entries) {
-            for (int i=0; i<entries.size(); i++) {
+            for (RosterEntry entry : entries) {
                 RosterPacket packet = new RosterPacket();
                 packet.setType(IQ.Type.SET);
-                RosterEntry entry = (RosterEntry)entries.get(i);
                 RosterPacket.Item item = RosterEntry.toRosterItem(entry);
                 item.removeGroupName(this.name);
                 item.addGroupName(name);
@@ -121,8 +123,7 @@ public class RosterGroup {
         user = StringUtils.parseBareAddress(user);
         String userLowerCase = user.toLowerCase();
         synchronized (entries) {
-            for (Iterator i=entries.iterator(); i.hasNext(); ) {
-                RosterEntry entry = (RosterEntry)i.next();
+            for (RosterEntry entry : entries) {
                 if (entry.getUser().equals(userLowerCase)) {
                     return entry;
                 }
diff --git a/source/org/jivesoftware/smack/SASLAuthentication.java b/source/org/jivesoftware/smack/SASLAuthentication.java
index 7b5aa48fc..f8f531418 100644
--- a/source/org/jivesoftware/smack/SASLAuthentication.java
+++ b/source/org/jivesoftware/smack/SASLAuthentication.java
@@ -59,11 +59,11 @@ import java.util.*;
  */
 public class SASLAuthentication implements UserAuthentication {
 
-    private static Map implementedMechanisms = new HashMap();
-    private static List mechanismsPreferences = new ArrayList();
+    private static Map<String, Class> implementedMechanisms = new HashMap<String, Class>();
+    private static List<String> mechanismsPreferences = new ArrayList<String>();
 
     private XMPPConnection connection;
-    private Collection serverMechanisms = new ArrayList();
+    private Collection<String> serverMechanisms = new ArrayList<String>();
     private SASLMechanism currentMechanism = null;
     /**
      * Boolean indicating if SASL negotiation has finished and was successful.
@@ -115,10 +115,10 @@ public class SASLAuthentication implements UserAuthentication {
      *
      * @return the registerd SASLMechanism classes sorted by the level of preference.
      */
-    public static List getRegisterSASLMechanisms() {
-        List answer = new ArrayList();
-        for (Iterator it = mechanismsPreferences.iterator(); it.hasNext();) {
-            answer.add(implementedMechanisms.get(it.next()));
+    public static List<Class> getRegisterSASLMechanisms() {
+        List<Class> answer = new ArrayList<Class>();
+        for (String mechanismsPreference : mechanismsPreferences) {
+            answer.add(implementedMechanisms.get(mechanismsPreference));
         }
         return answer;
     }
@@ -171,11 +171,10 @@ public class SASLAuthentication implements UserAuthentication {
             throws XMPPException {
         // Locate the SASLMechanism to use
         Class selected = null;
-        for (Iterator it = mechanismsPreferences.iterator(); it.hasNext();) {
-            String mechanism = (String) it.next();
+        for (String mechanism : mechanismsPreferences) {
             if (implementedMechanisms.containsKey(mechanism) &&
                     serverMechanisms.contains(mechanism)) {
-                selected = (Class) implementedMechanisms.get(mechanism);
+                selected = implementedMechanisms.get(mechanism);
                 break;
             }
         }
@@ -339,7 +338,7 @@ public class SASLAuthentication implements UserAuthentication {
      * @param mechanisms collection of strings with the available SASL mechanism reported
      *                   by the server.
      */
-    void setAvailableSASLMethods(Collection mechanisms) {
+    void setAvailableSASLMethods(Collection<String> mechanisms) {
         this.serverMechanisms = mechanisms;
     }
 
diff --git a/source/org/jivesoftware/smack/SmackConfiguration.java b/source/org/jivesoftware/smack/SmackConfiguration.java
index b3ccd2d7d..40500f442 100644
--- a/source/org/jivesoftware/smack/SmackConfiguration.java
+++ b/source/org/jivesoftware/smack/SmackConfiguration.java
@@ -63,8 +63,8 @@ public final class SmackConfiguration {
         try {
             // Get an array of class loaders to try loading the providers files from.
             ClassLoader[] classLoaders = getClassLoaders();
-            for (int i = 0; i < classLoaders.length; i++) {
-                Enumeration configEnum = classLoaders[i].getResources("META-INF/smack-config.xml");
+            for (ClassLoader classLoader : classLoaders) {
+                Enumeration configEnum = classLoader.getResources("META-INF/smack-config.xml");
                 while (configEnum.hasMoreElements()) {
                     URL url = (URL) configEnum.nextElement();
                     InputStream systemStream = null;
@@ -81,7 +81,8 @@ public final class SmackConfiguration {
                                     parseClassToLoad(parser);
                                 }
                                 else if (parser.getName().equals("packetReplyTimeout")) {
-                                    packetReplyTimeout = parseIntProperty(parser, packetReplyTimeout);
+                                    packetReplyTimeout =
+                                            parseIntProperty(parser, packetReplyTimeout);
                                 }
                                 else if (parser.getName().equals("keepAliveInterval")) {
                                     keepAliveInterval = parseIntProperty(parser, keepAliveInterval);
@@ -200,7 +201,7 @@ public final class SmackConfiguration {
      */
     private static ClassLoader[] getClassLoaders() {
         ClassLoader[] classLoaders = new ClassLoader[2];
-        classLoaders[0] = new SmackConfiguration().getClass().getClassLoader();
+        classLoaders[0] = SmackConfiguration.class.getClassLoader();
         classLoaders[1] = Thread.currentThread().getContextClassLoader();
         return classLoaders;
     }
diff --git a/source/org/jivesoftware/smack/XMPPConnection.java b/source/org/jivesoftware/smack/XMPPConnection.java
index 246a84ade..d7ed5fa25 100644
--- a/source/org/jivesoftware/smack/XMPPConnection.java
+++ b/source/org/jivesoftware/smack/XMPPConnection.java
@@ -39,7 +39,11 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.net.Socket;
 import java.net.UnknownHostException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Creates a connection to a XMPP server. A simple use of this API might
@@ -73,7 +77,8 @@ public class XMPPConnection {
      */
     public static boolean DEBUG_ENABLED = false;
 
-    private static List connectionEstablishedListeners = new ArrayList();
+    private final static List<ConnectionEstablishedListener> connectionEstablishedListeners =
+            new ArrayList<ConnectionEstablishedListener>();
 
     static {
         // Use try block since we may not have permission to get a system
@@ -128,7 +133,7 @@ public class XMPPConnection {
      * does not interfere with garbage collection. The map of chats must be stored
      * with each connection.
      */
-    Map chats = Collections.synchronizedMap(new HashMap());
+    Map<String, WeakReference<Chat>> chats = new ConcurrentHashMap<String, WeakReference<Chat>>();
 
     /**
      * Collection of available stream compression methods offered by the server.
@@ -289,7 +294,9 @@ public class XMPPConnection {
             // constructor it cannot be modified
             this.configuration = (ConnectionConfiguration) config.clone();
         }
-        catch (CloneNotSupportedException e) {}
+        catch (CloneNotSupportedException e) {
+            // Do nothing
+        }
         init();
     }
 
@@ -419,7 +426,7 @@ public class XMPPConnection {
         // Do partial version of nameprep on the username.
         username = username.toLowerCase().trim();
 
-        String response = null;
+        String response;
         if (configuration.isSASLAuthenticationEnabled() &&
                 saslAuthentication.hasNonAnonymousAuthentication()) {
             // Authenticate using SASL
@@ -488,7 +495,7 @@ public class XMPPConnection {
             throw new IllegalStateException("Already logged in to server.");
         }
 
-        String response = null;
+        String response;
         if (configuration.isSASLAuthenticationEnabled() &&
                 saslAuthentication.hasAnonymousAuthentication()) {
             response = saslAuthentication.authenticateAnonymously();
@@ -876,12 +883,12 @@ public class XMPPConnection {
                     if (message.getThread() == null &&
                             message.getType() != Message.Type.GROUP_CHAT &&
                             message.getType() != Message.Type.HEADLINE) {
-                        WeakReference chatRef = (WeakReference)chats.get(
-                                StringUtils.parseBareAddress(message.getFrom()));
+                        WeakReference<Chat> chatRef =
+                                chats.get(StringUtils.parseBareAddress(message.getFrom()));
                         if (chatRef != null) {
                             // Do some extra clean-up if the reference was cleared.
-                            Chat chat;
-                            if ((chat = (Chat)chatRef.get()) == null) {
+                            Chat chat = chatRef.get();
+                            if (chat == null) {
                                 chats.remove(message.getFrom());
                             }
                             else {
@@ -931,9 +938,9 @@ public class XMPPConnection {
             }
             else {
                 try {
-                    Class zoClass = Class.forName("com.jcraft.jzlib.ZOutputStream");
+                    Class<?> zoClass = Class.forName("com.jcraft.jzlib.ZOutputStream");
                     //ZOutputStream out = new ZOutputStream(socket.getOutputStream(), JZlib.Z_BEST_COMPRESSION);
-                    Constructor constructor =
+                    Constructor<?> constructor =
                             zoClass.getConstructor(new Class[]{OutputStream.class, Integer.TYPE});
                     Object out = constructor.newInstance(new Object[] {socket.getOutputStream(), new Integer(9)});
                     //out.setFlushMode(JZlib.Z_PARTIAL_FLUSH);
@@ -941,7 +948,7 @@ public class XMPPConnection {
                     method.invoke(out, new Object[] {new Integer(1)});
                     writer = new BufferedWriter(new OutputStreamWriter((OutputStream) out, "UTF-8"));
 
-                    Class ziClass = Class.forName("com.jcraft.jzlib.ZInputStream");
+                    Class<?> ziClass = Class.forName("com.jcraft.jzlib.ZInputStream");
                     //ZInputStream in = new ZInputStream(socket.getInputStream());
                     constructor = ziClass.getConstructor(new Class[]{InputStream.class});
                     Object in = constructor.newInstance(new Object[] {socket.getInputStream()});
@@ -976,7 +983,7 @@ public class XMPPConnection {
                 }
                 catch (Throwable t) {
                 }
-                Class debuggerClass = null;
+                Class<?> debuggerClass = null;
                 if (className != null) {
                     try {
                         debuggerClass = Class.forName(className);
@@ -1002,7 +1009,7 @@ public class XMPPConnection {
                 // Create a new debugger instance. If an exception occurs then disable the debugging
                 // option
                 try {
-                    Constructor constructor =
+                    Constructor<?> constructor =
                         debuggerClass.getConstructor(
                             new Class[] { XMPPConnection.class, Writer.class, Reader.class });
                     debugger = (SmackDebugger) constructor
@@ -1027,13 +1034,13 @@ public class XMPPConnection {
      * Fires listeners on connection established events.
      */
     private static void connectionEstablished(XMPPConnection connection) {
-        ConnectionEstablishedListener[] listeners = null;
+        ConnectionEstablishedListener[] listeners;
         synchronized (connectionEstablishedListeners) {
             listeners = new ConnectionEstablishedListener[connectionEstablishedListeners.size()];
             connectionEstablishedListeners.toArray(listeners);
         }
-        for (int i = 0; i < listeners.length; i++) {
-            listeners[i].connectionEstablished(connection);
+        for (ConnectionEstablishedListener listener : listeners) {
+            listener.connectionEstablished(connection);
         }
     }
 
diff --git a/source/org/jivesoftware/smack/XMPPException.java b/source/org/jivesoftware/smack/XMPPException.java
index 5b60220ba..1e875b295 100644
--- a/source/org/jivesoftware/smack/XMPPException.java
+++ b/source/org/jivesoftware/smack/XMPPException.java
@@ -20,8 +20,8 @@
 
 package org.jivesoftware.smack;
 
-import org.jivesoftware.smack.packet.XMPPError;
 import org.jivesoftware.smack.packet.StreamError;
+import org.jivesoftware.smack.packet.XMPPError;
 
 import java.io.PrintStream;
 import java.io.PrintWriter;
@@ -199,7 +199,7 @@ public class XMPPException extends Exception {
     }
 
     public String toString() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         String message = super.getMessage();
         if (message != null) {
             buf.append(message).append(": ");
diff --git a/source/org/jivesoftware/smack/packet/Authentication.java b/source/org/jivesoftware/smack/packet/Authentication.java
index dce690b40..723e4e445 100644
--- a/source/org/jivesoftware/smack/packet/Authentication.java
+++ b/source/org/jivesoftware/smack/packet/Authentication.java
@@ -146,7 +146,7 @@ public class Authentication extends IQ {
     }
 
     public String getChildElementXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<query xmlns=\"jabber:iq:auth\">");
         if (username != null) {
             if (username.equals("")) {
diff --git a/source/org/jivesoftware/smack/packet/Bind.java b/source/org/jivesoftware/smack/packet/Bind.java
index 9d589b921..74875fef8 100644
--- a/source/org/jivesoftware/smack/packet/Bind.java
+++ b/source/org/jivesoftware/smack/packet/Bind.java
@@ -57,7 +57,7 @@ public class Bind extends IQ {
     }
 
     public String getChildElementXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<bind xmlns=\"urn:ietf:params:xml:ns:xmpp-bind\">");
         if (resource != null) {
             buf.append("<resource>").append(resource).append("</resource>");
diff --git a/source/org/jivesoftware/smack/packet/DefaultPacketExtension.java b/source/org/jivesoftware/smack/packet/DefaultPacketExtension.java
index cbf1b5efe..3a04356ae 100644
--- a/source/org/jivesoftware/smack/packet/DefaultPacketExtension.java
+++ b/source/org/jivesoftware/smack/packet/DefaultPacketExtension.java
@@ -20,7 +20,10 @@
 
 package org.jivesoftware.smack.packet;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 
 /**
  * Default implementation of the PacketExtension interface. Unless a PacketExtensionProvider
@@ -80,7 +83,7 @@ public class DefaultPacketExtension implements PacketExtension {
     }
 
     public String toXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<").append(elementName).append(" xmlns=\"").append(namespace).append("\">");
         for (Iterator i=getNames(); i.hasNext(); ) {
             String name = (String)i.next();
diff --git a/source/org/jivesoftware/smack/packet/IQ.java b/source/org/jivesoftware/smack/packet/IQ.java
index 926e4e422..5b9dfe62a 100644
--- a/source/org/jivesoftware/smack/packet/IQ.java
+++ b/source/org/jivesoftware/smack/packet/IQ.java
@@ -67,7 +67,7 @@ public abstract class IQ extends Packet {
     }
 
     public String toXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<iq ");
         if (getPacketID() != null) {
             buf.append("id=\"" + getPacketID() + "\" ");
diff --git a/source/org/jivesoftware/smack/packet/Message.java b/source/org/jivesoftware/smack/packet/Message.java
index 193b24d1f..04fdeb819 100644
--- a/source/org/jivesoftware/smack/packet/Message.java
+++ b/source/org/jivesoftware/smack/packet/Message.java
@@ -165,7 +165,7 @@ public class Message extends Packet {
     }
 
     public String toXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<message");
         if (getPacketID() != null) {
             buf.append(" id=\"").append(getPacketID()).append("\"");
diff --git a/source/org/jivesoftware/smack/packet/Packet.java b/source/org/jivesoftware/smack/packet/Packet.java
index a0de7a602..bb4d54af9 100644
--- a/source/org/jivesoftware/smack/packet/Packet.java
+++ b/source/org/jivesoftware/smack/packet/Packet.java
@@ -22,8 +22,10 @@ package org.jivesoftware.smack.packet;
 
 import org.jivesoftware.smack.util.StringUtils;
 
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
 import java.util.*;
-import java.io.*;
 
 /**
  * Base class for XMPP packets. Every packet has a unique ID (which is automatically
@@ -351,7 +353,7 @@ public abstract class Packet {
      * are no packet extensions.
      */
     protected synchronized String getExtensionsXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         // Add in all standard extension sub-packets.
         Iterator extensions = getExtensions();
         while (extensions.hasNext()) {
diff --git a/source/org/jivesoftware/smack/packet/Presence.java b/source/org/jivesoftware/smack/packet/Presence.java
index 5535b7ca0..6762c9f9a 100644
--- a/source/org/jivesoftware/smack/packet/Presence.java
+++ b/source/org/jivesoftware/smack/packet/Presence.java
@@ -169,7 +169,7 @@ public class Presence extends Packet {
     }
 
     public String toXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<presence");
         if (getPacketID() != null) {
             buf.append(" id=\"").append(getPacketID()).append("\"");
@@ -208,7 +208,7 @@ public class Presence extends Packet {
     }
 
     public String toString() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append(type);
         if (mode != null) {
             buf.append(": ").append(mode);
diff --git a/source/org/jivesoftware/smack/packet/Registration.java b/source/org/jivesoftware/smack/packet/Registration.java
index 07b06daa7..804d893ec 100644
--- a/source/org/jivesoftware/smack/packet/Registration.java
+++ b/source/org/jivesoftware/smack/packet/Registration.java
@@ -21,7 +21,6 @@
 package org.jivesoftware.smack.packet;
 
 import java.util.Map;
-import java.util.Iterator;
 
 /**
  * Represents registration packets. An empty GET query will cause the server to return information
@@ -49,7 +48,7 @@ import java.util.Iterator;
 public class Registration extends IQ {
 
     private String instructions = null;
-    private Map attributes = null;
+    private Map<String, String> attributes = null;
 
     /**
      * Returns the registration instructions, or <tt>null</tt> if no instructions
@@ -76,7 +75,7 @@ public class Registration extends IQ {
      *
      * @return the account attributes.
      */
-    public Map getAttributes() {
+    public Map<String, String> getAttributes() {
         return attributes;
     }
 
@@ -85,21 +84,19 @@ public class Registration extends IQ {
      *
      * @param attributes the account attributes.
      */
-    public void setAttributes(Map attributes) {
+    public void setAttributes(Map<String, String> attributes) {
         this.attributes = attributes;
     }
 
     public String getChildElementXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<query xmlns=\"jabber:iq:register\">");
         if (instructions != null) {
             buf.append("<instructions>").append(instructions).append("</instructions>");
         }
         if (attributes != null && attributes.size() > 0) {
-            Iterator fieldNames = attributes.keySet().iterator();
-            while (fieldNames.hasNext()) {
-                String name = (String)fieldNames.next();
-                String value = (String)attributes.get(name);
+            for (String name : attributes.keySet()) {
+                String value = attributes.get(name);
                 buf.append("<").append(name).append(">");
                 buf.append(value);
                 buf.append("</").append(name).append(">");
diff --git a/source/org/jivesoftware/smack/packet/RosterPacket.java b/source/org/jivesoftware/smack/packet/RosterPacket.java
index 5b0502815..53c738349 100644
--- a/source/org/jivesoftware/smack/packet/RosterPacket.java
+++ b/source/org/jivesoftware/smack/packet/RosterPacket.java
@@ -68,7 +68,7 @@ public class RosterPacket extends IQ {
     }
 
     public String getChildElementXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<query xmlns=\"jabber:iq:roster\">");
         synchronized (rosterItems) {
             for (Item entry : rosterItems) {
@@ -197,7 +197,7 @@ public class RosterPacket extends IQ {
         }
 
         public String toXML() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("<item jid=\"").append(user).append("\"");
             if (name != null) {
                 buf.append(" name=\"").append(name).append("\"");
diff --git a/source/org/jivesoftware/smack/packet/StreamError.java b/source/org/jivesoftware/smack/packet/StreamError.java
index 3e692514e..8bb4c75bc 100644
--- a/source/org/jivesoftware/smack/packet/StreamError.java
+++ b/source/org/jivesoftware/smack/packet/StreamError.java
@@ -99,7 +99,7 @@ public class StreamError {
     }
 
     public String toString() {
-        StringBuffer txt = new StringBuffer();
+        StringBuilder txt = new StringBuilder();
         txt.append("stream:error (").append(code).append(")");
         return txt.toString();
     }
diff --git a/source/org/jivesoftware/smack/packet/XMPPError.java b/source/org/jivesoftware/smack/packet/XMPPError.java
index 6d90c48e6..0c03fe27d 100644
--- a/source/org/jivesoftware/smack/packet/XMPPError.java
+++ b/source/org/jivesoftware/smack/packet/XMPPError.java
@@ -97,7 +97,7 @@ public class XMPPError {
      * @return the error as XML.
      */
     public String toXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<error code=\"").append(code).append("\">");
         if (message != null) {
             buf.append(message);
@@ -107,7 +107,7 @@ public class XMPPError {
     }
 
     public String toString() {
-        StringBuffer txt = new StringBuffer();
+        StringBuilder txt = new StringBuilder();
         txt.append("(").append(code).append(")");
         if (message != null) {
             txt.append(" ").append(message);
diff --git a/source/org/jivesoftware/smack/provider/ProviderManager.java b/source/org/jivesoftware/smack/provider/ProviderManager.java
index f7cd792da..4149a05e4 100644
--- a/source/org/jivesoftware/smack/provider/ProviderManager.java
+++ b/source/org/jivesoftware/smack/provider/ProviderManager.java
@@ -22,11 +22,12 @@ package org.jivesoftware.smack.provider;
 
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.PacketExtension;
-import org.xmlpull.v1.*;
 import org.xmlpull.mxp1.MXParser;
+import org.xmlpull.v1.XmlPullParser;
 
-import java.util.*;
+import java.io.InputStream;
 import java.net.URL;
+import java.util.*;
 
 /**
  * Manages providers for parsing custom XML sub-documents of XMPP packets. Two types of
@@ -117,12 +118,12 @@ public class ProviderManager {
         try {
             // Get an array of class loaders to try loading the providers files from.
             ClassLoader[] classLoaders = getClassLoaders();
-            for (int i=0; i<classLoaders.length; i++) {
-                Enumeration providerEnum = classLoaders[i].getResources(
+            for (ClassLoader classLoader : classLoaders) {
+                Enumeration providerEnum = classLoader.getResources(
                         "META-INF/smack.providers");
                 while (providerEnum.hasMoreElements()) {
-                    URL url = (URL)providerEnum.nextElement();
-                    java.io.InputStream providerStream = null;
+                    URL url = (URL) providerEnum.nextElement();
+                    InputStream providerStream = null;
                     try {
                         providerStream = url.openStream();
                         XmlPullParser parser = new MXParser();
@@ -187,13 +188,11 @@ public class ProviderManager {
                                             // Add the provider to the map.
                                             Class provider = Class.forName(className);
                                             if (PacketExtensionProvider.class.isAssignableFrom(
-                                                    provider))
-                                            {
+                                                    provider)) {
                                                 extensionProviders.put(key, provider.newInstance());
                                             }
                                             else if (PacketExtension.class.isAssignableFrom(
-                                                    provider))
-                                            {
+                                                    provider)) {
                                                 extensionProviders.put(key, provider);
                                             }
                                         }
@@ -204,11 +203,15 @@ public class ProviderManager {
                                 }
                             }
                             eventType = parser.next();
-                        } while (eventType != XmlPullParser.END_DOCUMENT);
+                        }
+                        while (eventType != XmlPullParser.END_DOCUMENT);
                     }
                     finally {
-                        try { providerStream.close(); }
-                        catch (Exception e) { }
+                        try {
+                            providerStream.close();
+                        }
+                        catch (Exception e) {
+                        }
                     }
                 }
             }
@@ -362,7 +365,7 @@ public class ProviderManager {
      * @return a unique key for the element name and namespace pair.
      */
     private static String getProviderKey(String elementName, String namespace) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<").append(elementName).append("/><").append(namespace).append("/>");
         return buf.toString();
     }
diff --git a/source/org/jivesoftware/smack/sasl/SASLMechanism.java b/source/org/jivesoftware/smack/sasl/SASLMechanism.java
index 2b775456a..9a2771f62 100644
--- a/source/org/jivesoftware/smack/sasl/SASLMechanism.java
+++ b/source/org/jivesoftware/smack/sasl/SASLMechanism.java
@@ -55,7 +55,7 @@ public abstract class SASLMechanism {
      */
     public void authenticate(String username, String host, String password) throws IOException {
         // Build the authentication stanza encoding the authentication text
-        StringBuffer stanza = new StringBuffer();
+        StringBuilder stanza = new StringBuilder();
         stanza.append("<auth mechanism=\"").append(getName());
         stanza.append("\" xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">");
         String authenticationText = getAuthenticationText(username, host, password);
@@ -76,7 +76,7 @@ public abstract class SASLMechanism {
      */
     public void challengeReceived(String challenge) throws IOException {
         // Build the challenge response stanza encoding the response text
-        StringBuffer stanza = new StringBuffer();
+        StringBuilder stanza = new StringBuilder();
         stanza.append("<response xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">");
         String authenticationText = getChallengeResponse(StringUtils.decodeBase64(challenge));
         if (authenticationText != null) {
diff --git a/source/org/jivesoftware/smack/sasl/SASLPlainMechanism.java b/source/org/jivesoftware/smack/sasl/SASLPlainMechanism.java
index 7c534216d..ccd257461 100644
--- a/source/org/jivesoftware/smack/sasl/SASLPlainMechanism.java
+++ b/source/org/jivesoftware/smack/sasl/SASLPlainMechanism.java
@@ -42,7 +42,7 @@ public class SASLPlainMechanism extends SASLMechanism {
     protected String getAuthenticationText(String username, String host, String password) {
         // Build the text containing the "authorization identity" + NUL char +
         // "authentication identity" + NUL char + "clear-text password"
-        StringBuffer text = new StringBuffer();
+        StringBuilder text = new StringBuilder();
         text.append(username).append("@").append(host);
         text.append('\0');
         text.append(username);
diff --git a/source/org/jivesoftware/smack/util/Cache.java b/source/org/jivesoftware/smack/util/Cache.java
index 009e23b8a..f4cbaeede 100644
--- a/source/org/jivesoftware/smack/util/Cache.java
+++ b/source/org/jivesoftware/smack/util/Cache.java
@@ -549,7 +549,7 @@ public class Cache implements Map {
          */
         public String toString() {
             LinkedListNode node = head.next;
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             while (node != head) {
                 buf.append(node.toString()).append(", ");
                 node = node.next;
diff --git a/source/org/jivesoftware/smack/util/StringUtils.java b/source/org/jivesoftware/smack/util/StringUtils.java
index 629be2931..d0d685788 100644
--- a/source/org/jivesoftware/smack/util/StringUtils.java
+++ b/source/org/jivesoftware/smack/util/StringUtils.java
@@ -20,9 +20,9 @@
 
 package org.jivesoftware.smack.util;
 
+import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.io.UnsupportedEncodingException;
 import java.util.Random;
 
 /**
@@ -143,7 +143,7 @@ public class StringUtils {
         int last=0;
         char[] input = string.toCharArray();
         int len = input.length;
-        StringBuffer out = new StringBuffer((int)(len*1.3));
+        StringBuilder out = new StringBuilder((int)(len*1.3));
         for (; i < len; i++) {
             ch = input[i];
             if (ch > '>') {
@@ -243,13 +243,13 @@ public class StringUtils {
      * @return generated hex string.
      */
     public static String encodeHex(byte[] bytes) {
-        StringBuffer hex = new StringBuffer(bytes.length * 2);
+        StringBuilder hex = new StringBuilder(bytes.length * 2);
 
-        for (int i=0; i<bytes.length; i++) {
-            if (((int) bytes[i] & 0xff) < 0x10) {
+        for (byte aByte : bytes) {
+            if (((int) aByte & 0xff) < 0x10) {
                 hex.append("0");
             }
-            hex.append(Integer.toString((int) bytes[i] & 0xff, 16));
+            hex.append(Integer.toString((int) aByte & 0xff, 16));
         }
 
         return hex.toString();
diff --git a/source/org/jivesoftware/smackx/Form.java b/source/org/jivesoftware/smackx/Form.java
index 0f9ae8084..55ce065f8 100644
--- a/source/org/jivesoftware/smackx/Form.java
+++ b/source/org/jivesoftware/smackx/Form.java
@@ -20,11 +20,15 @@
 
 package org.jivesoftware.smackx;
 
-import java.util.*;
-
-import org.jivesoftware.smack.packet.*;
+import org.jivesoftware.smack.packet.Packet;
+import org.jivesoftware.smack.packet.PacketExtension;
 import org.jivesoftware.smackx.packet.DataForm;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
+
 /**
  * Represents a Form for gathering data. The form could be of the following types:
  * <ul>
@@ -334,8 +338,8 @@ public class Form {
             // Clear the old values
             field.resetValues();
             // Set the default value
-            for (Iterator it = field.getValues(); it.hasNext();) {
-                field.addValue((String) it.next());
+            for (Iterator<String> it = field.getValues(); it.hasNext();) {
+                field.addValue(it.next());
             }
         }
         else {
@@ -348,7 +352,7 @@ public class Form {
      *
      * @return an Iterator for the fields that are part of the form.
      */
-    public Iterator getFields() {
+    public Iterator<FormField> getFields() {
         return dataForm.getFields();
     }
 
@@ -366,8 +370,8 @@ public class Form {
         }
         // Look for the field whose variable matches the requested variable
         FormField field;
-        for (Iterator it=getFields();it.hasNext();) {
-            field = (FormField)it.next();
+        for (Iterator<FormField> it=getFields();it.hasNext();) {
+            field = it.next();
             if (variable.equals(field.getVariable())) {
                 return field;
             }
@@ -381,7 +385,7 @@ public class Form {
      * @return instructions that explain how to fill out the form.
      */
     public String getInstructions() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         // Join the list of instructions together separated by newlines
         for (Iterator it = dataForm.getInstructions(); it.hasNext();) {
             sb.append((String) it.next());
@@ -432,7 +436,7 @@ public class Form {
      */
     public void setInstructions(String instructions) {
         // Split the instructions into multiple instructions for each existent newline
-        ArrayList instructionsList = new ArrayList();
+        ArrayList<String> instructionsList = new ArrayList<String>();
         StringTokenizer st = new StringTokenizer(instructions, "\n");
         while (st.hasMoreTokens()) {
             instructionsList.add(st.nextToken());
@@ -464,8 +468,8 @@ public class Form {
         if (isSubmitType()) {
             // Create a new DataForm that contains only the answered fields 
             DataForm dataFormToSend = new DataForm(getType());
-            for(Iterator it=getFields();it.hasNext();) {
-                FormField field = (FormField)it.next();
+            for(Iterator<FormField> it=getFields();it.hasNext();) {
+                FormField field = it.next();
                 if (field.getValues().hasNext()) {
                     dataFormToSend.addField(field);
                 }
@@ -513,8 +517,8 @@ public class Form {
         }
         // Create a new Form
         Form form = new Form(TYPE_SUBMIT);
-        for (Iterator fields=getFields(); fields.hasNext();) {
-            FormField field = (FormField)fields.next();
+        for (Iterator<FormField> fields=getFields(); fields.hasNext();) {
+            FormField field = fields.next();
             // Add to the new form any type of field that includes a variable.
             // Note: The fields of type FIXED are the only ones that don't specify a variable
             if (field.getVariable() != null) {
@@ -525,9 +529,9 @@ public class Form {
                 if (FormField.TYPE_HIDDEN.equals(field.getType())) {
                     // Since a hidden field could have many values we need to collect them 
                     // in a list
-                    List values = new ArrayList();
-                    for (Iterator it=field.getValues();it.hasNext();) {
-                        values.add((String)it.next());
+                    List<String> values = new ArrayList<String>();
+                    for (Iterator<String> it=field.getValues();it.hasNext();) {
+                        values.add(it.next());
                     }
                     form.setAnswer(field.getVariable(), values);
                 }                
diff --git a/source/org/jivesoftware/smackx/FormField.java b/source/org/jivesoftware/smackx/FormField.java
index c8fafb965..643ca7a91 100644
--- a/source/org/jivesoftware/smackx/FormField.java
+++ b/source/org/jivesoftware/smackx/FormField.java
@@ -20,7 +20,10 @@
 
 package org.jivesoftware.smackx;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * Represents a field of a form. The field could be used to represent a question to complete,
@@ -46,8 +49,8 @@ public class FormField {
     private String label;
     private String variable;
     private String type;
-    private List options = new ArrayList();
-    private List values = new ArrayList();
+    private final List<Option> options = new ArrayList<Option>();
+    private final List<String> values = new ArrayList<String>();
 
     /**
      * Creates a new FormField with the variable name that uniquely identifies the field 
@@ -97,9 +100,9 @@ public class FormField {
      * 
      * @return Iterator for the available options. 
      */
-    public Iterator getOptions() {
+    public Iterator<Option> getOptions() {
         synchronized (options) {
-            return Collections.unmodifiableList(new ArrayList(options)).iterator();
+            return Collections.unmodifiableList(new ArrayList<Option>(options)).iterator();
         }
     }
 
@@ -144,9 +147,9 @@ public class FormField {
      * 
      * @return an Iterator for the default values or answered values of the question. 
      */
-    public Iterator getValues() {
+    public Iterator<String> getValues() {
         synchronized (values) {
-            return Collections.unmodifiableList(new ArrayList(values)).iterator();
+            return Collections.unmodifiableList(new ArrayList<String>(values)).iterator();
         }
     }
 
@@ -234,7 +237,7 @@ public class FormField {
      *  
      * @param newValues default values or an answered values of the question.
      */
-    public void addValues(List newValues) {
+    public void addValues(List<String> newValues) {
         synchronized (values) {
             values.addAll(newValues);
         }
@@ -246,7 +249,7 @@ public class FormField {
      */
     protected void resetValues() {
         synchronized (values) {
-            values.removeAll(new ArrayList(values));
+            values.removeAll(new ArrayList<String>(values));
         }
     }
     
@@ -263,7 +266,7 @@ public class FormField {
     }
 
     public String toXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<field");
         // Add attributes
         if (getLabel() != null) {
@@ -284,7 +287,7 @@ public class FormField {
             buf.append("<required/>");
         }
         // Loop through all the values and append them to the string buffer
-        for (Iterator i = getValues(); i.hasNext();) {
+        for (Iterator<String> i = getValues(); i.hasNext();) {
             buf.append("<value>").append(i.next()).append("</value>");
         }
         // Loop through all the values and append them to the string buffer
@@ -337,7 +340,7 @@ public class FormField {
         }
 
         public String toXML() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("<option");
             // Add attribute
             if (getLabel() != null) {
diff --git a/source/org/jivesoftware/smackx/GroupChatInvitation.java b/source/org/jivesoftware/smackx/GroupChatInvitation.java
index c2ee81ad1..53404e2e0 100644
--- a/source/org/jivesoftware/smackx/GroupChatInvitation.java
+++ b/source/org/jivesoftware/smackx/GroupChatInvitation.java
@@ -99,7 +99,7 @@ public class GroupChatInvitation implements PacketExtension {
     }
 
     public String toXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<x xmlns=\"jabber:x:conference\" jid=\"").append(roomAddress).append("\"/>");
         return buf.toString();
     }
diff --git a/source/org/jivesoftware/smackx/NodeInformationProvider.java b/source/org/jivesoftware/smackx/NodeInformationProvider.java
index 3c18fcfc2..e36037500 100644
--- a/source/org/jivesoftware/smackx/NodeInformationProvider.java
+++ b/source/org/jivesoftware/smackx/NodeInformationProvider.java
@@ -20,6 +20,8 @@
 
 package org.jivesoftware.smackx;
 
+import org.jivesoftware.smackx.packet.DiscoverItems;
+
 import java.util.Iterator;
 
 
@@ -40,7 +42,7 @@ public interface NodeInformationProvider {
      *  
      * @return an Iterator on the Items defined in the node.
      */
-    public abstract Iterator getNodeItems();
+    public abstract Iterator<DiscoverItems.Item> getNodeItems();
 
     /**
      * Returns an Iterator on the features defined in the node. For
@@ -50,5 +52,5 @@ public interface NodeInformationProvider {
      *
      * @return an Iterator on the feature strings defined in the node.
      */
-    public abstract Iterator getNodeFeatures();
+    public abstract Iterator<String> getNodeFeatures();
 }
diff --git a/source/org/jivesoftware/smackx/OfflineMessageManager.java b/source/org/jivesoftware/smackx/OfflineMessageManager.java
index ba4331d83..a58db3ac3 100644
--- a/source/org/jivesoftware/smackx/OfflineMessageManager.java
+++ b/source/org/jivesoftware/smackx/OfflineMessageManager.java
@@ -93,7 +93,7 @@ public class OfflineMessageManager {
                 namespace);
         Form extendedInfo = Form.getFormFrom(info);
         if (extendedInfo != null) {
-            String value = (String) extendedInfo.getField("number_of_messages").getValues().next();
+            String value = extendedInfo.getField("number_of_messages").getValues().next();
             return Integer.parseInt(value);
         }
         return 0;
@@ -109,8 +109,8 @@ public class OfflineMessageManager {
      * @throws XMPPException If the user is not allowed to make this request or the server does
      *                       not support offline message retrieval.
      */
-    public Iterator getHeaders() throws XMPPException {
-        List answer = new ArrayList();
+    public Iterator<OfflineMessageHeader> getHeaders() throws XMPPException {
+        List<OfflineMessageHeader> answer = new ArrayList<OfflineMessageHeader>();
         DiscoverItems items = ServiceDiscoveryManager.getInstanceFor(connection).discoverItems(
                 null, namespace);
         for (Iterator it = items.getItems(); it.hasNext();) {
@@ -132,11 +132,11 @@ public class OfflineMessageManager {
      * @throws XMPPException If the user is not allowed to make this request or the server does
      *                       not support offline message retrieval.
      */
-    public Iterator getMessages(final List nodes) throws XMPPException {
-        List messages = new ArrayList();
+    public Iterator<Message> getMessages(final List<String> nodes) throws XMPPException {
+        List<Message> messages = new ArrayList<Message>();
         OfflineMessageRequest request = new OfflineMessageRequest();
-        for (Iterator it = nodes.iterator(); it.hasNext();) {
-            OfflineMessageRequest.Item item = new OfflineMessageRequest.Item((String) it.next());
+        for (String node : nodes) {
+            OfflineMessageRequest.Item item = new OfflineMessageRequest.Item(node);
             item.setAction("view");
             request.addItem(item);
         }
@@ -188,8 +188,8 @@ public class OfflineMessageManager {
      * @throws XMPPException If the user is not allowed to make this request or the server does
      *                       not support offline message retrieval.
      */
-    public Iterator getMessages() throws XMPPException {
-        List messages = new ArrayList();
+    public Iterator<Message> getMessages() throws XMPPException {
+        List<Message> messages = new ArrayList<Message>();
         OfflineMessageRequest request = new OfflineMessageRequest();
         request.setFetch(true);
         // Filter packets looking for an answer from the server.
@@ -232,10 +232,10 @@ public class OfflineMessageManager {
      * @throws XMPPException If the user is not allowed to make this request or the server does
      *                       not support offline message retrieval.
      */
-    public void deleteMessages(List nodes) throws XMPPException {
+    public void deleteMessages(List<String> nodes) throws XMPPException {
         OfflineMessageRequest request = new OfflineMessageRequest();
-        for (Iterator it = nodes.iterator(); it.hasNext();) {
-            OfflineMessageRequest.Item item = new OfflineMessageRequest.Item((String) it.next());
+        for (String node : nodes) {
+            OfflineMessageRequest.Item item = new OfflineMessageRequest.Item(node);
             item.setAction("remove");
             request.addItem(item);
         }
diff --git a/source/org/jivesoftware/smackx/PrivateDataManager.java b/source/org/jivesoftware/smackx/PrivateDataManager.java
index 040739912..e838021ca 100644
--- a/source/org/jivesoftware/smackx/PrivateDataManager.java
+++ b/source/org/jivesoftware/smackx/PrivateDataManager.java
@@ -20,16 +20,20 @@
 
 package org.jivesoftware.smackx;
 
-import org.jivesoftware.smack.*;
-import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.PacketCollector;
+import org.jivesoftware.smack.SmackConfiguration;
+import org.jivesoftware.smack.XMPPConnection;
+import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.filter.PacketIDFilter;
 import org.jivesoftware.smack.packet.IQ;
-import org.jivesoftware.smackx.packet.*;
-import org.jivesoftware.smackx.provider.*;
+import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smackx.packet.DefaultPrivateData;
+import org.jivesoftware.smackx.packet.PrivateData;
+import org.jivesoftware.smackx.provider.PrivateDataProvider;
 import org.xmlpull.v1.XmlPullParser;
 
-import java.util.Map;
 import java.util.Hashtable;
+import java.util.Map;
 
 /**
  * Manages private data, which is a mechanism to allow users to store arbitrary XML
@@ -177,7 +181,7 @@ public class PrivateDataManager {
         // Create an IQ packet to get the private data.
         IQ privateDataGet = new IQ() {
             public String getChildElementXML() {
-                StringBuffer buf = new StringBuffer();
+                StringBuilder buf = new StringBuilder();
                 buf.append("<query xmlns=\"jabber:iq:private\">");
                 buf.append("<").append(elementName).append(" xmlns=\"").append(namespace).append("\"/>");
                 buf.append("</query>");
@@ -223,7 +227,7 @@ public class PrivateDataManager {
         // Create an IQ packet to set the private data.
         IQ privateDataSet = new IQ() {
             public String getChildElementXML() {
-                StringBuffer buf = new StringBuffer();
+                StringBuilder buf = new StringBuilder();
                 buf.append("<query xmlns=\"jabber:iq:private\">");
                 buf.append(privateData.toXML());
                 buf.append("</query>");
@@ -264,7 +268,7 @@ public class PrivateDataManager {
      * @return a unique key for the element name and namespace pair.
      */
     private static String getProviderKey(String elementName, String namespace) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<").append(elementName).append("/><").append(namespace).append("/>");
         return buf.toString();
     }
@@ -343,7 +347,7 @@ public class PrivateDataManager {
         }
 
         public String getChildElementXML() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("<query xmlns=\"jabber:iq:private\">");
             if (privateData != null) {
                 privateData.toXML();
diff --git a/source/org/jivesoftware/smackx/RemoteRosterEntry.java b/source/org/jivesoftware/smackx/RemoteRosterEntry.java
index e8c62de31..fe329e2c2 100644
--- a/source/org/jivesoftware/smackx/RemoteRosterEntry.java
+++ b/source/org/jivesoftware/smackx/RemoteRosterEntry.java
@@ -99,7 +99,7 @@ public class RemoteRosterEntry {
     }
 
     public String toXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<item jid=\"").append(user).append("\"");
         if (name != null) {
             buf.append(" name=\"").append(name).append("\"");
diff --git a/source/org/jivesoftware/smackx/ReportedData.java b/source/org/jivesoftware/smackx/ReportedData.java
index 93e5fd140..028dab109 100644
--- a/source/org/jivesoftware/smackx/ReportedData.java
+++ b/source/org/jivesoftware/smackx/ReportedData.java
@@ -20,11 +20,15 @@
 
 package org.jivesoftware.smackx;
 
-import java.util.*;
-
-import org.jivesoftware.smack.packet.*;
+import org.jivesoftware.smack.packet.Packet;
+import org.jivesoftware.smack.packet.PacketExtension;
 import org.jivesoftware.smackx.packet.DataForm;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
 /**
  * Represents a set of data results returned as part of a search. The report is structured 
  * in columns and rows.
@@ -33,8 +37,8 @@ import org.jivesoftware.smackx.packet.DataForm;
  */
 public class ReportedData {
     
-    private List columns = new ArrayList();
-    private List rows = new ArrayList();
+    private List<Column> columns = new ArrayList<Column>();
+    private List<Row> rows = new ArrayList<Row>();
     private String title = "";
     
     /**
@@ -73,13 +77,13 @@ public class ReportedData {
         // Add the rows to the report based on the form's items
         for (Iterator items = dataForm.getItems(); items.hasNext();) {
             DataForm.Item item = (DataForm.Item)items.next();
-            List fieldList = new ArrayList(columns.size());
+            List<Field> fieldList = new ArrayList<Field>(columns.size());
             FormField field;
             for (Iterator fields = item.getFields(); fields.hasNext();) {
                 field = (FormField) fields.next();
                 // The field is created with all the values of the data form's field
-                List values = new ArrayList();
-                for (Iterator it=field.getValues(); it.hasNext();) {
+                List<String> values = new ArrayList<String>();
+                for (Iterator<String> it=field.getValues(); it.hasNext();) {
                     values.add(it.next());
                 }
                 fieldList.add(new Field(field.getVariable(), values));
@@ -118,8 +122,8 @@ public class ReportedData {
      *
      * @return an Iterator for the rows returned from a search.
      */
-    public Iterator getRows() {
-        return Collections.unmodifiableList(new ArrayList(rows)).iterator();
+    public Iterator<Row> getRows() {
+        return Collections.unmodifiableList(new ArrayList<Row>(rows)).iterator();
     }
 
     /**
@@ -127,8 +131,8 @@ public class ReportedData {
      *
      * @return an Iterator for the columns returned from a search.
      */
-    public Iterator getColumns() {
-        return Collections.unmodifiableList(new ArrayList(columns)).iterator();
+    public Iterator<Column> getColumns() {
+        return Collections.unmodifiableList(new ArrayList<Column>(columns)).iterator();
     }
 
 
@@ -215,9 +219,9 @@ public class ReportedData {
     }
 
     public static class Row {
-        private List fields = new ArrayList();
+        private List<Field> fields = new ArrayList<Field>();
 
-        public Row(List fields) {
+        public Row(List<Field> fields) {
             this.fields = fields;
         }
 
@@ -228,8 +232,8 @@ public class ReportedData {
          * @return the values of the field whose variable matches the requested variable.
          */
         public Iterator getValues(String variable) {
-            for(Iterator it=getFields();it.hasNext();) {
-                Field field = (Field) it.next();
+            for(Iterator<Field> it=getFields();it.hasNext();) {
+                Field field = it.next();
                 if (variable.equalsIgnoreCase(field.getVariable())) {
                     return field.getValues();
                 }
@@ -242,16 +246,16 @@ public class ReportedData {
          *
          * @return the fields that define the data that goes with the item.
          */
-        private Iterator getFields() {
-            return Collections.unmodifiableList(new ArrayList(fields)).iterator();
+        private Iterator<Field> getFields() {
+            return Collections.unmodifiableList(new ArrayList<Field>(fields)).iterator();
         }
     }
 
     public static class Field {
         private String variable;
-        private List values;
+        private List<String> values;
 
-        public Field(String variable, List values) {
+        public Field(String variable, List<String> values) {
             this.variable = variable;
             this.values = values;
         }
@@ -270,7 +274,7 @@ public class ReportedData {
          * 
          * @return the returned values of the search.
          */
-        public Iterator getValues() {
+        public Iterator<String> getValues() {
             return Collections.unmodifiableList(values).iterator();
         }
     }
diff --git a/source/org/jivesoftware/smackx/ServiceDiscoveryManager.java b/source/org/jivesoftware/smackx/ServiceDiscoveryManager.java
index c32d52a68..a34085c3a 100644
--- a/source/org/jivesoftware/smackx/ServiceDiscoveryManager.java
+++ b/source/org/jivesoftware/smackx/ServiceDiscoveryManager.java
@@ -31,6 +31,7 @@ import org.jivesoftware.smackx.packet.DiscoverInfo;
 import org.jivesoftware.smackx.packet.DiscoverItems;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Manages discovery of services in XMPP entities. This class provides:
@@ -48,11 +49,13 @@ public class ServiceDiscoveryManager {
     private static String identityName = "Smack";
     private static String identityType = "pc";
 
-    private static Map instances = new Hashtable();
+    private static Map<XMPPConnection, ServiceDiscoveryManager> instances =
+            new ConcurrentHashMap<XMPPConnection, ServiceDiscoveryManager>();
 
     private XMPPConnection connection;
-    private List features = new ArrayList();
-    private Map nodeInformationProviders = new Hashtable();
+    private final List<String> features = new ArrayList<String>();
+    private Map<String, NodeInformationProvider> nodeInformationProviders =
+            new ConcurrentHashMap<String, NodeInformationProvider>();
 
     // Create a new ServiceDiscoveryManager on every established connection
     static {
@@ -82,7 +85,7 @@ public class ServiceDiscoveryManager {
      * @return the ServiceDiscoveryManager associated with a given XMPPConnection.
      */
     public static ServiceDiscoveryManager getInstanceFor(XMPPConnection connection) {
-        return (ServiceDiscoveryManager) instances.get(connection);
+        return instances.get(connection);
     }
 
     /**
@@ -211,8 +214,8 @@ public class ServiceDiscoveryManager {
                         response.addIdentity(identity);
                         // Add the registered features to the response
                         synchronized (features) {
-                            for (Iterator it = getFeatures(); it.hasNext();) {
-                                response.addFeature((String) it.next());
+                            for (Iterator<String> it = getFeatures(); it.hasNext();) {
+                                response.addFeature(it.next());
                             }
                         }
                     }
@@ -258,7 +261,7 @@ public class ServiceDiscoveryManager {
         if (node == null) {
             return null;
         }
-        return (NodeInformationProvider) nodeInformationProviders.get(node);
+        return nodeInformationProviders.get(node);
     }
 
     /**
@@ -297,9 +300,9 @@ public class ServiceDiscoveryManager {
      * 
      * @return an Iterator on the supported features by this XMPP entity.
      */
-    public Iterator getFeatures() {
+    public Iterator<String> getFeatures() {
         synchronized (features) {
-            return Collections.unmodifiableList(new ArrayList(features)).iterator();
+            return Collections.unmodifiableList(new ArrayList<String>(features)).iterator();
         }
     }
 
diff --git a/source/org/jivesoftware/smackx/XHTMLText.java b/source/org/jivesoftware/smackx/XHTMLText.java
index ee67e2880..5f7be1777 100644
--- a/source/org/jivesoftware/smackx/XHTMLText.java
+++ b/source/org/jivesoftware/smackx/XHTMLText.java
@@ -30,7 +30,7 @@ import org.jivesoftware.smack.util.StringUtils;
  */
 public class XHTMLText {
 
-    private StringBuffer text = new StringBuffer(30);
+    private StringBuilder text = new StringBuilder(30);
 
     /**
      * Creates a new XHTMLText with body tag params.
@@ -49,7 +49,7 @@ public class XHTMLText {
      * @param style the XHTML style of the anchor
      */
     public void appendOpenAnchorTag(String href, String style) {
-        StringBuffer sb = new StringBuffer("<a");
+        StringBuilder sb = new StringBuilder("<a");
         if (href != null) {
             sb.append(" href=\"");
             sb.append(href);
@@ -78,7 +78,7 @@ public class XHTMLText {
      * @param style the XHTML style of the blockquote
      */
     public void appendOpenBlockQuoteTag(String style) {
-        StringBuffer sb = new StringBuffer("<blockquote");
+        StringBuilder sb = new StringBuilder("<blockquote");
         if (style != null) {
             sb.append(" style=\"");
             sb.append(style);
@@ -103,7 +103,7 @@ public class XHTMLText {
      * @param lang the language of the body
      */
     private void appendOpenBodyTag(String style, String lang) {
-        StringBuffer sb = new StringBuffer("<body");
+        StringBuilder sb = new StringBuilder("<body");
         if (style != null) {
             sb.append(" style=\"");
             sb.append(style);
@@ -184,7 +184,7 @@ public class XHTMLText {
         if (level > 3 || level < 1) {
             return;
         }
-        StringBuffer sb = new StringBuffer("<h");
+        StringBuilder sb = new StringBuilder("<h");
         sb.append(level);
         if (style != null) {
             sb.append(" style=\"");
@@ -204,7 +204,7 @@ public class XHTMLText {
         if (level > 3 || level < 1) {
             return;
         }
-        StringBuffer sb = new StringBuffer("</h");
+        StringBuilder sb = new StringBuilder("</h");
         sb.append(level);
         sb.append(">");
         text.append(sb.toString());
@@ -220,7 +220,7 @@ public class XHTMLText {
      * @param width how wide is the picture
      */
     public void appendImageTag(String align, String alt, String height, String src, String width) {
-        StringBuffer sb = new StringBuffer("<img");
+        StringBuilder sb = new StringBuilder("<img");
         if (align != null) {
             sb.append(" align=\"");
             sb.append(align);
@@ -256,7 +256,7 @@ public class XHTMLText {
      * @param style the style of the line item
      */
     public void appendLineItemTag(String style) {
-        StringBuffer sb = new StringBuffer("<li");
+        StringBuilder sb = new StringBuilder("<li");
         if (style != null) {
             sb.append(" style=\"");
             sb.append(style);
@@ -273,7 +273,7 @@ public class XHTMLText {
      * @param style the style of the ordered list
      */
     public void appendOpenOrderedListTag(String style) {
-        StringBuffer sb = new StringBuffer("<ol");
+        StringBuilder sb = new StringBuilder("<ol");
         if (style != null) {
             sb.append(" style=\"");
             sb.append(style);
@@ -298,7 +298,7 @@ public class XHTMLText {
      * @param style the style of the unordered list
      */
     public void appendOpenUnorderedListTag(String style) {
-        StringBuffer sb = new StringBuffer("<ul");
+        StringBuilder sb = new StringBuilder("<ul");
         if (style != null) {
             sb.append(" style=\"");
             sb.append(style);
@@ -323,7 +323,7 @@ public class XHTMLText {
      * @param style the style of the paragraph
      */
     public void appendOpenParagraphTag(String style) {
-        StringBuffer sb = new StringBuffer("<p");
+        StringBuilder sb = new StringBuilder("<p");
         if (style != null) {
             sb.append(" style=\"");
             sb.append(style);
@@ -348,7 +348,7 @@ public class XHTMLText {
      * @param style the style of the inlined quote
      */
     public void appendOpenInlinedQuoteTag(String style) {
-        StringBuffer sb = new StringBuffer("<q");
+        StringBuilder sb = new StringBuilder("<q");
         if (style != null) {
             sb.append(" style=\"");
             sb.append(style);
@@ -372,7 +372,7 @@ public class XHTMLText {
      * @param style the style for a span of text
      */
     public void appendOpenSpanTag(String style) {
-        StringBuffer sb = new StringBuffer("<span");
+        StringBuilder sb = new StringBuilder("<span");
         if (style != null) {
             sb.append(" style=\"");
             sb.append(style);
diff --git a/source/org/jivesoftware/smackx/bookmark/Bookmarks.java b/source/org/jivesoftware/smackx/bookmark/Bookmarks.java
index e2bd5afd9..4f2d8958d 100644
--- a/source/org/jivesoftware/smackx/bookmark/Bookmarks.java
+++ b/source/org/jivesoftware/smackx/bookmark/Bookmarks.java
@@ -12,10 +12,10 @@ import org.jivesoftware.smackx.provider.PrivateDataProvider;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.io.IOException;
 
 /**
  * Bookmarks is used for storing and retrieving URLS and Conference rooms.
@@ -155,7 +155,7 @@ public class Bookmarks implements PrivateData {
      * @return the private data as XML.
      */
     public String toXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<storage xmlns=\"storage:bookmarks\">");
 
         final Iterator urls = getBookmarkedURLS().iterator();
diff --git a/source/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java b/source/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
index cc378edba..d46caf0c2 100644
--- a/source/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
+++ b/source/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
@@ -312,7 +312,7 @@ public class FileTransferNegotiator {
      * @return Returns a new, unique, stream ID to identify a file transfer.
      */
     public String getNextStreamID() {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         buffer.append(STREAM_INIT_PREFIX);
         buffer.append(Math.abs(randomGenerator.nextLong()));
 
@@ -398,8 +398,8 @@ public class FileTransferNegotiator {
         String variable;
         boolean isByteStream = false;
         boolean isIBB = false;
-        for (Iterator it = field.getValues(); it.hasNext();) {
-            variable = (it.next().toString());
+        for (Iterator<String> it = field.getValues(); it.hasNext();) {
+            variable = it.next();
             if (variable.equals(BYTE_STREAM) && !IBB_ONLY) {
                 isByteStream = true;
             }
diff --git a/source/org/jivesoftware/smackx/muc/DeafOccupantInterceptor.java b/source/org/jivesoftware/smackx/muc/DeafOccupantInterceptor.java
index 2df0afdc2..c0351c99e 100644
--- a/source/org/jivesoftware/smackx/muc/DeafOccupantInterceptor.java
+++ b/source/org/jivesoftware/smackx/muc/DeafOccupantInterceptor.java
@@ -65,7 +65,7 @@ public class DeafOccupantInterceptor implements PacketInterceptor {
         }
 
         public String toXML() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("<").append(getElementName()).append(" xmlns=\"").append(getNamespace())
                     .append("\">");
             buf.append("<deaf-occupant/>");
diff --git a/source/org/jivesoftware/smackx/muc/MultiUserChat.java b/source/org/jivesoftware/smackx/muc/MultiUserChat.java
index 56073ca3d..1096ddb0e 100644
--- a/source/org/jivesoftware/smackx/muc/MultiUserChat.java
+++ b/source/org/jivesoftware/smackx/muc/MultiUserChat.java
@@ -32,6 +32,7 @@ import java.lang.ref.WeakReference;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * A MultiUserChat is a conversation that takes place among many users in a virtual
@@ -41,37 +42,38 @@ import java.util.*;
  * different privileges (e.g. Send messages to all occupants, Kick participants and visitors,
  * Grant voice, Edit member list, etc.).
  *
- * @author Gaston Dombiak
+ * @author Gaston Dombiak, Larry Kirschner
  */
 public class MultiUserChat {
 
     private final static String discoNamespace = "http://jabber.org/protocol/muc";
     private final static String discoNode = "http://jabber.org/protocol/muc#rooms";
 
-    private static Map joinedRooms = new WeakHashMap();
+    private static Map<XMPPConnection, List<String>> joinedRooms =
+            new WeakHashMap<XMPPConnection, List<String>>();
 
     private XMPPConnection connection;
     private String room;
     private String subject;
     private String nickname = null;
     private boolean joined = false;
-    private Map occupantsMap = new HashMap();
+    private Map<String, Presence> occupantsMap = new ConcurrentHashMap<String, Presence>();
 
-    private List invitationRejectionListeners = new ArrayList();
-    private List subjectUpdatedListeners = new ArrayList();
-    private List userStatusListeners = new ArrayList();
-    private List participantStatusListeners = new ArrayList();
+    private final List<InvitationRejectionListener> invitationRejectionListeners =
+            new ArrayList<InvitationRejectionListener>();
+    private final List<SubjectUpdatedListener> subjectUpdatedListeners =
+            new ArrayList<SubjectUpdatedListener>();
+    private final List<UserStatusListener> userStatusListeners =
+            new ArrayList<UserStatusListener>();
+    private final List<ParticipantStatusListener> participantStatusListeners =
+            new ArrayList<ParticipantStatusListener>();
 
     private PacketFilter presenceFilter;
-    private PacketListener presenceListener;
-    private List presenceInterceptors = new ArrayList();
-    private PacketFilter subjectFilter;
-    private PacketListener subjectListener;
+    private List<PacketInterceptor> presenceInterceptors = new ArrayList<PacketInterceptor>();
     private PacketFilter messageFilter;
-    private PacketFilter declinesFilter;
-    private PacketListener declinesListener;
-    private PacketCollector messageCollector;
-    private List connectionListeners = new ArrayList();
+    private RoomListenerMultiplexor roomListenerMultiplexor;
+    private ConnectionDetachedPacketCollector messageCollector;
+    private List<PacketListener> connectionListeners = new ArrayList<PacketListener>();
 
     static {
         XMPPConnection.addConnectionListener(new ConnectionEstablishedListener() {
@@ -85,16 +87,16 @@ public class MultiUserChat {
                 ServiceDiscoveryManager.getInstanceFor(connection).setNodeInformationProvider(
                     discoNode,
                     new NodeInformationProvider() {
-                        public Iterator getNodeItems() {
-                            ArrayList answer = new ArrayList();
-                            Iterator rooms=MultiUserChat.getJoinedRooms(connection);
+                        public Iterator<DiscoverItems.Item> getNodeItems() {
+                            List<DiscoverItems.Item> answer = new ArrayList<DiscoverItems.Item>();
+                            Iterator<String> rooms=MultiUserChat.getJoinedRooms(connection);
                             while (rooms.hasNext()) {
-                                answer.add(new DiscoverItems.Item((String)rooms.next()));
+                                answer.add(new DiscoverItems.Item(rooms.next()));
                             }
                             return answer.iterator();
                         }
 
-                        public Iterator getNodeFeatures() {
+                        public Iterator<String> getNodeFeatures() {
                             return null;
                         }
                     });
@@ -150,13 +152,13 @@ public class MultiUserChat {
      * @param connection the connection used to join the rooms.
      * @return an Iterator on the rooms where the user has joined using a given connection.
      */
-    private static Iterator getJoinedRooms(XMPPConnection connection) {
-        ArrayList rooms = (ArrayList)joinedRooms.get(connection);
+    private static Iterator<String> getJoinedRooms(XMPPConnection connection) {
+        List<String> rooms = joinedRooms.get(connection);
         if (rooms != null) {
             return rooms.iterator();
         }
         // Return an iterator on an empty collection (i.e. the user never joined a room)
-        return new ArrayList().iterator();
+        return new ArrayList<String>().iterator();
     }
 
     /**
@@ -167,22 +169,22 @@ public class MultiUserChat {
      * @param user the user to check. A fully qualified xmpp ID, e.g. jdoe@example.com.
      * @return an Iterator on the rooms where the requested user has joined.
      */
-    public static Iterator getJoinedRooms(XMPPConnection connection, String user) {
+    public static Iterator<String> getJoinedRooms(XMPPConnection connection, String user) {
         try {
-            ArrayList answer = new ArrayList();
+            ArrayList<String> answer = new ArrayList<String>();
             // Send the disco packet to the user
             DiscoverItems result =
                 ServiceDiscoveryManager.getInstanceFor(connection).discoverItems(user, discoNode);
             // Collect the entityID for each returned item
-            for (Iterator items=result.getItems(); items.hasNext();) {
-                answer.add(((DiscoverItems.Item)items.next()).getEntityID());
+            for (Iterator<DiscoverItems.Item> items=result.getItems(); items.hasNext();) {
+                answer.add(items.next().getEntityID());
             }
             return answer.iterator();
         }
         catch (XMPPException e) {
             e.printStackTrace();
             // Return an iterator on an empty collection
-            return new ArrayList().iterator();
+            return new ArrayList<String>().iterator();
         }
     }
 
@@ -209,12 +211,12 @@ public class MultiUserChat {
      * @return a collection with the XMPP addresses of the Multi-User Chat services.
      * @throws XMPPException if an error occured while trying to discover MUC services.
      */
-    public static Collection getServiceNames(XMPPConnection connection) throws XMPPException {
-        final List answer = new ArrayList();
+    public static Collection<String> getServiceNames(XMPPConnection connection) throws XMPPException {
+        final List<String> answer = new ArrayList<String>();
         ServiceDiscoveryManager discoManager = ServiceDiscoveryManager.getInstanceFor(connection);
         DiscoverItems items = discoManager.discoverItems(connection.getServiceName());
-        for (Iterator it = items.getItems(); it.hasNext();) {
-            DiscoverItems.Item item = (DiscoverItems.Item) it.next();
+        for (Iterator<DiscoverItems.Item> it = items.getItems(); it.hasNext();) {
+            DiscoverItems.Item item = it.next();
             try {
                 DiscoverInfo info = discoManager.discoverInfo(item.getEntityID());
                 if (info.containsFeature("http://jabber.org/protocol/muc")) {
@@ -239,14 +241,13 @@ public class MultiUserChat {
      * @return a collection of HostedRooms.
      * @throws XMPPException if an error occured while trying to discover the information.
      */
-    public static Collection getHostedRooms(XMPPConnection connection, String serviceName)
+    public static Collection<HostedRoom> getHostedRooms(XMPPConnection connection, String serviceName)
             throws XMPPException {
-        List answer = new ArrayList();
+        List<HostedRoom> answer = new ArrayList<HostedRoom>();
         ServiceDiscoveryManager discoManager = ServiceDiscoveryManager.getInstanceFor(connection);
         DiscoverItems items = discoManager.discoverItems(serviceName);
-        for (Iterator it = items.getItems(); it.hasNext();) {
-            DiscoverItems.Item item = (DiscoverItems.Item) it.next();
-            answer.add(new HostedRoom(item));
+        for (Iterator<DiscoverItems.Item> it = items.getItems(); it.hasNext();) {
+            answer.add(new HostedRoom(it.next()));
         }
         return answer;
     }
@@ -261,24 +262,24 @@ public class MultiUserChat {
     }
 
     /**
-     * Creates the room according to some default configuration, assign the requesting user 
-     * as the room owner, and add the owner to the room but not allow anyone else to enter 
+     * Creates the room according to some default configuration, assign the requesting user
+     * as the room owner, and add the owner to the room but not allow anyone else to enter
      * the room (effectively "locking" the room). The requesting user will join the room
      * under the specified nickname as soon as the room has been created.<p>
-     * 
-     * To create an "Instant Room", that means a room with some default configuration that is 
-     * available for immediate access, the room's owner should send an empty form after creating 
+     *
+     * To create an "Instant Room", that means a room with some default configuration that is
+     * available for immediate access, the room's owner should send an empty form after creating
      * the room. {@link #sendConfigurationForm(Form)}<p>
-     *   
-     * To create a "Reserved Room", that means a room manually configured by the room creator 
-     * before anyone is allowed to enter, the room's owner should complete and send a form after 
-     * creating the room. Once the completed configutation form is sent to the server, the server  
+     *
+     * To create a "Reserved Room", that means a room manually configured by the room creator
+     * before anyone is allowed to enter, the room's owner should complete and send a form after
+     * creating the room. Once the completed configutation form is sent to the server, the server
      * will unlock the room. {@link #sendConfigurationForm(Form)}
-     * 
+     *
      * @param nickname the nickname to use.
      * @throws XMPPException if the room couldn't be created for some reason
      *          (e.g. room already exists; user already joined to an existant room or
-     *          405 error if the user is not allowed to create the room) 
+     *          405 error if the user is not allowed to create the room)
      */
     public synchronized void create(String nickname) throws XMPPException {
         if (nickname == null || nickname.equals("")) {
@@ -293,11 +294,10 @@ public class MultiUserChat {
         // and signal support for MUC. The owner will be automatically logged into the room.
         Presence joinPresence = new Presence(Presence.Type.available);
         joinPresence.setTo(room + "/" + nickname);
-        // Indicate the the client supports MUC          
+        // Indicate the the client supports MUC
         joinPresence.addExtension(new MUCInitialPresence());
         // Invoke presence interceptors so that extra information can be dynamically added
-        for (Iterator it = presenceInterceptors.iterator(); it.hasNext();) {
-            PacketInterceptor packetInterceptor = (PacketInterceptor) it.next();
+        for (PacketInterceptor packetInterceptor : presenceInterceptors) {
             packetInterceptor.interceptPacket(joinPresence);
         }
 
@@ -344,14 +344,14 @@ public class MultiUserChat {
      * using another nickname, this method will first leave the room and then
      * re-join using the new nickname. The default timeout of Smack for a reply
      * from the group chat server that the join succeeded will be used. After
-     * joining the room, the room will decide the amount of history to send. 
+     * joining the room, the room will decide the amount of history to send.
      *
      * @param nickname the nickname to use.
-     * @throws XMPPException if an error occurs joining the room. In particular, a 
-     *      401 error can occur if no password was provided and one is required; or a 
-     *      403 error can occur if the user is banned; or a 
-     *      404 error can occur if the room does not exist or is locked; or a 
-     *      407 error can occur if user is not on the member list; or a 
+     * @throws XMPPException if an error occurs joining the room. In particular, a
+     *      401 error can occur if no password was provided and one is required; or a
+     *      403 error can occur if the user is banned; or a
+     *      404 error can occur if the room does not exist or is locked; or a
+     *      407 error can occur if user is not on the member list; or a
      *      409 error can occur if someone is already in the group chat with the same nickname.
      */
     public void join(String nickname) throws XMPPException {
@@ -363,18 +363,18 @@ public class MultiUserChat {
      * using another nickname, this method will first leave the room and then
      * re-join using the new nickname. The default timeout of Smack for a reply
      * from the group chat server that the join succeeded will be used. After
-     * joining the room, the room will decide the amount of history to send.<p> 
-     * 
+     * joining the room, the room will decide the amount of history to send.<p>
+     *
      * A password is required when joining password protected rooms. If the room does
      * not require a password there is no need to provide one.
      *
      * @param nickname the nickname to use.
      * @param password the password to use.
-     * @throws XMPPException if an error occurs joining the room. In particular, a 
-     *      401 error can occur if no password was provided and one is required; or a 
-     *      403 error can occur if the user is banned; or a 
-     *      404 error can occur if the room does not exist or is locked; or a 
-     *      407 error can occur if user is not on the member list; or a 
+     * @throws XMPPException if an error occurs joining the room. In particular, a
+     *      401 error can occur if no password was provided and one is required; or a
+     *      403 error can occur if the user is banned; or a
+     *      404 error can occur if the room does not exist or is locked; or a
+     *      407 error can occur if user is not on the member list; or a
      *      409 error can occur if someone is already in the group chat with the same nickname.
      */
     public void join(String nickname, String password) throws XMPPException {
@@ -385,25 +385,25 @@ public class MultiUserChat {
      * Joins the chat room using the specified nickname and password. If already joined
      * using another nickname, this method will first leave the room and then
      * re-join using the new nickname.<p>
-     * 
+     *
      * To control the amount of history to receive while joining a room you will need to provide
      * a configured DiscussionHistory object.<p>
-     * 
+     *
      * A password is required when joining password protected rooms. If the room does
      * not require a password there is no need to provide one.<p>
-     * 
+     *
      * If the room does not already exist when the user seeks to enter it, the server will
-     * decide to create a new room or not. 
-     * 
+     * decide to create a new room or not.
+     *
      * @param nickname the nickname to use.
      * @param password the password to use.
      * @param history the amount of discussion history to receive while joining a room.
      * @param timeout the amount of time to wait for a reply from the MUC service(in milleseconds).
-     * @throws XMPPException if an error occurs joining the room. In particular, a 
-     *      401 error can occur if no password was provided and one is required; or a 
-     *      403 error can occur if the user is banned; or a 
-     *      404 error can occur if the room does not exist or is locked; or a 
-     *      407 error can occur if user is not on the member list; or a 
+     * @throws XMPPException if an error occurs joining the room. In particular, a
+     *      401 error can occur if no password was provided and one is required; or a
+     *      403 error can occur if the user is banned; or a
+     *      404 error can occur if the room does not exist or is locked; or a
+     *      407 error can occur if user is not on the member list; or a
      *      409 error can occur if someone is already in the group chat with the same nickname.
      */
     public synchronized void join(
@@ -425,7 +425,7 @@ public class MultiUserChat {
         Presence joinPresence = new Presence(Presence.Type.available);
         joinPresence.setTo(room + "/" + nickname);
 
-        // Indicate the the client supports MUC          
+        // Indicate the the client supports MUC
         MUCInitialPresence mucInitialPresence = new MUCInitialPresence();
         if (password != null) {
             mucInitialPresence.setPassword(password);
@@ -435,8 +435,7 @@ public class MultiUserChat {
         }
         joinPresence.addExtension(mucInitialPresence);
         // Invoke presence interceptors so that extra information can be dynamically added
-        for (Iterator it = presenceInterceptors.iterator(); it.hasNext();) {
-            PacketInterceptor packetInterceptor = (PacketInterceptor) it.next();
+        for (PacketInterceptor packetInterceptor : presenceInterceptors) {
             packetInterceptor.interceptPacket(joinPresence);
         }
 
@@ -487,24 +486,23 @@ public class MultiUserChat {
         Presence leavePresence = new Presence(Presence.Type.unavailable);
         leavePresence.setTo(room + "/" + nickname);
         // Invoke presence interceptors so that extra information can be dynamically added
-        for (Iterator it = presenceInterceptors.iterator(); it.hasNext();) {
-            PacketInterceptor packetInterceptor = (PacketInterceptor) it.next();
+        for (PacketInterceptor packetInterceptor : presenceInterceptors) {
             packetInterceptor.interceptPacket(leavePresence);
         }
         connection.sendPacket(leavePresence);
         // Reset occupant information.
-        occupantsMap = new HashMap();
+        occupantsMap.clear();
         nickname = null;
         joined = false;
         userHasLeft();
     }
 
     /**
-     * Returns the room's configuration form that the room's owner can use or <tt>null</tt> if 
-     * no configuration is possible. The configuration form allows to set the room's language, 
-     * enable logging, specify room's type, etc..  
-     * 
-     * @return the Form that contains the fields to complete together with the instrucions or 
+     * Returns the room's configuration form that the room's owner can use or <tt>null</tt> if
+     * no configuration is possible. The configuration form allows to set the room's language,
+     * enable logging, specify room's type, etc..
+     *
+     * @return the Form that contains the fields to complete together with the instrucions or
      * <tt>null</tt> if no configuration is possible.
      * @throws XMPPException if an error occurs asking the configuration form for the room.
      */
@@ -536,7 +534,7 @@ public class MultiUserChat {
      * Sends the completed configuration form to the server. The room will be configured
      * with the new settings defined in the form. If the form is empty then the server
      * will create an instant room (will use default configuration).
-     * 
+     *
      * @param form the form with the new settings.
      * @throws XMPPException if an error occurs setting the new rooms' configuration.
      */
@@ -565,17 +563,17 @@ public class MultiUserChat {
     }
 
     /**
-     * Returns the room's registration form that an unaffiliated user, can use to become a member 
-     * of the room or <tt>null</tt> if no registration is possible. Some rooms may restrict the 
+     * Returns the room's registration form that an unaffiliated user, can use to become a member
+     * of the room or <tt>null</tt> if no registration is possible. Some rooms may restrict the
      * privilege to register members and allow only room admins to add new members.<p>
-     * 
-     * If the user requesting registration requirements is not allowed to register with the room 
-     * (e.g. because that privilege has been restricted), the room will return a "Not Allowed" 
+     *
+     * If the user requesting registration requirements is not allowed to register with the room
+     * (e.g. because that privilege has been restricted), the room will return a "Not Allowed"
      * error to the user (error code 405).
-     * 
-     * @return the registration Form that contains the fields to complete together with the 
+     *
+     * @return the registration Form that contains the fields to complete together with the
      * instrucions or <tt>null</tt> if no registration is possible.
-     * @throws XMPPException if an error occurs asking the registration form for the room or a 
+     * @throws XMPPException if an error occurs asking the registration form for the room or a
      * 405 error if the user is not allowed to register with the room.
      */
     public Form getRegistrationForm() throws XMPPException {
@@ -599,17 +597,17 @@ public class MultiUserChat {
     }
 
     /**
-     * Sends the completed registration form to the server. After the user successfully submits 
-     * the form, the room may queue the request for review by the room admins or may immediately 
+     * Sends the completed registration form to the server. After the user successfully submits
+     * the form, the room may queue the request for review by the room admins or may immediately
      * add the user to the member list by changing the user's affiliation from "none" to "member.<p>
-     * 
-     * If the desired room nickname is already reserved for that room, the room will return a 
-     * "Conflict" error to the user (error code 409). If the room does not support registration, 
+     *
+     * If the desired room nickname is already reserved for that room, the room will return a
+     * "Conflict" error to the user (error code 409). If the room does not support registration,
      * it will return a "Service Unavailable" error to the user (error code 503).
-     * 
+     *
      * @param form the completed registration form.
-     * @throws XMPPException if an error occurs submitting the registration form. In particular, a 
-     *      409 error can occur if the desired room nickname is already reserved for that room; 
+     * @throws XMPPException if an error occurs submitting the registration form. In particular, a
+     *      409 error can occur if the desired room nickname is already reserved for that room;
      *      or a 503 error can occur if the room does not support registration.
      */
     public void sendRegistrationForm(Form form) throws XMPPException {
@@ -636,7 +634,7 @@ public class MultiUserChat {
      * Sends a request to the server to destroy the room. The sender of the request
      * should be the room's owner. If the sender of the destroy request is not the room's owner
      * then the server will answer a "Forbidden" error (403).
-     * 
+     *
      * @param reason the reason for the room destruction.
      * @param alternateJID the JID of an alternate location.
      * @throws XMPPException if an error occurs while trying to destroy the room.
@@ -672,16 +670,16 @@ public class MultiUserChat {
             throw new XMPPException(answer.getError());
         }
         // Reset occupant information.
-        occupantsMap = new HashMap();
+        occupantsMap.clear();
         nickname = null;
         joined = false;
         userHasLeft();
     }
 
     /**
-     * Invites another user to the room in which one is an occupant. The invitation 
+     * Invites another user to the room in which one is an occupant. The invitation
      * will be sent to the room which in turn will forward the invitation to the invitee.<p>
-     * 
+     *
      * If the room is password-protected, the invitee will receive a password to use to join
      * the room. If the room is members-only, the the invitee may be added to the member list.
      *
@@ -720,9 +718,9 @@ public class MultiUserChat {
     }
 
     /**
-     * Informs the sender of an invitation that the invitee declines the invitation. The rejection 
+     * Informs the sender of an invitation that the invitee declines the invitation. The rejection
      * will be sent to the room which in turn will forward the rejection to the inviter.
-     * 
+     *
      * @param conn the connection to use for sending the rejection.
      * @param room the room that sent the original invitation.
      * @param inviter the inviter of the declined invitation.
@@ -744,7 +742,7 @@ public class MultiUserChat {
     }
 
     /**
-     * Adds a listener to invitation notifications. The listener will be fired anytime 
+     * Adds a listener to invitation notifications. The listener will be fired anytime
      * an invitation is received.
      *
      * @param conn the connection where the listener will be applied.
@@ -755,7 +753,7 @@ public class MultiUserChat {
     }
 
     /**
-     * Removes a listener to invitation notifications. The listener will be fired anytime 
+     * Removes a listener to invitation notifications. The listener will be fired anytime
      * an invitation is received.
      *
      * @param conn the connection where the listener was applied.
@@ -766,7 +764,7 @@ public class MultiUserChat {
     }
 
     /**
-     * Adds a listener to invitation rejections notifications. The listener will be fired anytime 
+     * Adds a listener to invitation rejections notifications. The listener will be fired anytime
      * an invitation is declined.
      *
      * @param listener an invitation rejection listener.
@@ -780,7 +778,7 @@ public class MultiUserChat {
     }
 
     /**
-     * Removes a listener from invitation rejections notifications. The listener will be fired 
+     * Removes a listener from invitation rejections notifications. The listener will be fired
      * anytime an invitation is declined.
      *
      * @param listener an invitation rejection listener.
@@ -795,18 +793,18 @@ public class MultiUserChat {
      * Fires invitation rejection listeners.
      */
     private void fireInvitationRejectionListeners(String invitee, String reason) {
-        InvitationRejectionListener[] listeners = null;
+        InvitationRejectionListener[] listeners;
         synchronized (invitationRejectionListeners) {
             listeners = new InvitationRejectionListener[invitationRejectionListeners.size()];
             invitationRejectionListeners.toArray(listeners);
         }
-        for (int i = 0; i < listeners.length; i++) {
-            listeners[i].invitationDeclined(invitee, reason);
+        for (InvitationRejectionListener listener : listeners) {
+            listener.invitationDeclined(invitee, reason);
         }
     }
-    
+
     /**
-     * Adds a listener to subject change notifications. The listener will be fired anytime 
+     * Adds a listener to subject change notifications. The listener will be fired anytime
      * the room's subject changes.
      *
      * @param listener a subject updated listener.
@@ -820,7 +818,7 @@ public class MultiUserChat {
     }
 
     /**
-     * Removes a listener from subject change notifications. The listener will be fired 
+     * Removes a listener from subject change notifications. The listener will be fired
      * anytime the room's subject changes.
      *
      * @param listener a subject updated listener.
@@ -835,13 +833,13 @@ public class MultiUserChat {
      * Fires subject updated listeners.
      */
     private void fireSubjectUpdatedListeners(String subject, String from) {
-        SubjectUpdatedListener[] listeners = null;
+        SubjectUpdatedListener[] listeners;
         synchronized (subjectUpdatedListeners) {
             listeners = new SubjectUpdatedListener[subjectUpdatedListeners.size()];
             subjectUpdatedListeners.toArray(listeners);
         }
-        for (int i = 0; i < listeners.length; i++) {
-            listeners[i].subjectUpdated(subject, from);
+        for (SubjectUpdatedListener listener : listeners) {
+            listener.subjectUpdated(subject, from);
         }
     }
 
@@ -868,16 +866,16 @@ public class MultiUserChat {
     }
 
     /**
-     * Returns the last known room's subject or <tt>null</tt> if the user hasn't joined the room 
-     * or the room does not have a subject yet. In case the room has a subject, as soon as the 
+     * Returns the last known room's subject or <tt>null</tt> if the user hasn't joined the room
+     * or the room does not have a subject yet. In case the room has a subject, as soon as the
      * user joins the room a message with the current room's subject will be received.<p>
-     * 
+     *
      * To be notified every time the room's subject change you should add a listener
      * to this room. {@link #addSubjectUpdatedListener(SubjectUpdatedListener)}<p>
-     * 
+     *
      * To change the room's subject use {@link #changeSubject(String)}.
      *
-     * @return the room's subject or <tt>null</tt> if the user hasn't joined the room or the 
+     * @return the room's subject or <tt>null</tt> if the user hasn't joined the room or the
      * room does not have a subject yet.
      */
     public String getSubject() {
@@ -885,9 +883,9 @@ public class MultiUserChat {
     }
 
     /**
-     * Returns the reserved room nickname for the user in the room. A user may have a reserved 
-     * nickname, for example through explicit room registration or database integration. In such 
-     * cases it may be desirable for the user to discover the reserved nickname before attempting 
+     * Returns the reserved room nickname for the user in the room. A user may have a reserved
+     * nickname, for example through explicit room registration or database integration. In such
+     * cases it may be desirable for the user to discover the reserved nickname before attempting
      * to enter the room.
      *
      * @return the reserved room nickname or <tt>null</tt> if none.
@@ -898,9 +896,10 @@ public class MultiUserChat {
                 ServiceDiscoveryManager.getInstanceFor(connection).discoverInfo(
                     room,
                     "x-roomuser-item");
-            // Look for an Identity that holds the reserved nickname and return its name 
-            for (Iterator identities = result.getIdentities(); identities.hasNext();) {
-                DiscoverInfo.Identity identity = (DiscoverInfo.Identity) identities.next();
+            // Look for an Identity that holds the reserved nickname and return its name
+            for (Iterator<DiscoverInfo.Identity> identities = result.getIdentities();
+                 identities.hasNext();) {
+                DiscoverInfo.Identity identity = identities.next();
                 return identity.getName();
             }
             // If no Identity was found then the user does not have a reserved room nickname
@@ -924,11 +923,11 @@ public class MultiUserChat {
 
     /**
      * Changes the occupant's nickname to a new nickname within the room. Each room occupant
-     * will receive two presence packets. One of type "unavailable" for the old nickname and one 
-     * indicating availability for the new nickname. The unavailable presence will contain the new 
-     * nickname and an appropriate status code (namely 303) as extended presence information. The 
+     * will receive two presence packets. One of type "unavailable" for the old nickname and one
+     * indicating availability for the new nickname. The unavailable presence will contain the new
+     * nickname and an appropriate status code (namely 303) as extended presence information. The
      * status code 303 indicates that the occupant is changing his/her nickname.
-     * 
+     *
      * @param nickname the new nickname within the room.
      * @throws XMPPException if the new nickname is already in use by another occupant.
      */
@@ -947,8 +946,7 @@ public class MultiUserChat {
         Presence joinPresence = new Presence(Presence.Type.available);
         joinPresence.setTo(room + "/" + nickname);
         // Invoke presence interceptors so that extra information can be dynamically added
-        for (Iterator it = presenceInterceptors.iterator(); it.hasNext();) {
-            PacketInterceptor packetInterceptor = (PacketInterceptor) it.next();
+        for (PacketInterceptor packetInterceptor : presenceInterceptors) {
             packetInterceptor.interceptPacket(joinPresence);
         }
 
@@ -979,7 +977,7 @@ public class MultiUserChat {
      * Changes the occupant's availability status within the room. The presence type
      * will remain available but with a new status that describes the presence update and
      * a new presence mode (e.g. Extended away).
-     * 
+     *
      * @param status a text message describing the presence update.
      * @param mode the mode type for the presence update.
      */
@@ -1000,8 +998,7 @@ public class MultiUserChat {
         joinPresence.setMode(mode);
         joinPresence.setTo(room + "/" + nickname);
         // Invoke presence interceptors so that extra information can be dynamically added
-        for (Iterator it = presenceInterceptors.iterator(); it.hasNext();) {
-            PacketInterceptor packetInterceptor = (PacketInterceptor) it.next();
+        for (PacketInterceptor packetInterceptor : presenceInterceptors) {
             packetInterceptor.interceptPacket(joinPresence);
         }
 
@@ -1011,12 +1008,12 @@ public class MultiUserChat {
 
     /**
      * Kicks a visitor or participant from the room. The kicked occupant will receive a presence
-     * of type "unavailable" including a status code 307 and optionally along with the reason 
+     * of type "unavailable" including a status code 307 and optionally along with the reason
      * (if provided) and the bare JID of the user who initiated the kick. After the occupant
      * was kicked from the room, the rest of the occupants will receive a presence of type
      * "unavailable". The presence will include a status code 307 which means that the occupant
-     * was kicked from the room. 
-     * 
+     * was kicked from the room.
+     *
      * @param nickname the nickname of the participant or visitor to kick from the room
      * (e.g. "john").
      * @param reason the reason why the participant or visitor is being kicked from the room.
@@ -1035,14 +1032,14 @@ public class MultiUserChat {
      * Grants voice to visitors in the room. In a moderated room, a moderator may want to manage
      * who does and does not have "voice" in the room. To have voice means that a room occupant
      * is able to send messages to the room occupants.
-     * 
+     *
      * @param nicknames the nicknames of the visitors to grant voice in the room (e.g. "john").
-     * @throws XMPPException if an error occurs granting voice to a visitor. In particular, a 
+     * @throws XMPPException if an error occurs granting voice to a visitor. In particular, a
      *      403 error can occur if the occupant that intended to grant voice is not
      *      a moderator in this room (i.e. Forbidden error); or a
      *      400 error can occur if the provided nickname is not present in the room.
      */
-    public void grantVoice(Collection nicknames) throws XMPPException {
+    public void grantVoice(Collection<String> nicknames) throws XMPPException {
         changeRole(nicknames, "participant");
     }
 
@@ -1065,14 +1062,14 @@ public class MultiUserChat {
      * Revokes voice from participants in the room. In a moderated room, a moderator may want to
      * revoke an occupant's privileges to speak. To have voice means that a room occupant
      * is able to send messages to the room occupants.
-     * 
+     *
      * @param nicknames the nicknames of the participants to revoke voice (e.g. "john").
      * @throws XMPPException if an error occurs revoking voice from a participant. In particular, a
      *      405 error can occur if a moderator or a user with an affiliation of "owner" or "admin"
      *      was tried to revoke his voice (i.e. Not Allowed error); or a
      *      400 error can occur if the provided nickname is not present in the room.
      */
-    public void revokeVoice(Collection nicknames) throws XMPPException {
+    public void revokeVoice(Collection<String> nicknames) throws XMPPException {
         changeRole(nicknames, "visitor");
     }
 
@@ -1093,17 +1090,17 @@ public class MultiUserChat {
 
     /**
      * Bans users from the room. An admin or owner of the room can ban users from a room. This
-     * means that the banned user will no longer be able to join the room unless the ban has been 
-     * removed. If the banned user was present in the room then he/she will be removed from the 
-     * room and notified that he/she was banned along with the reason (if provided) and the bare 
-     * XMPP user ID of the user who initiated the ban. 
-     * 
+     * means that the banned user will no longer be able to join the room unless the ban has been
+     * removed. If the banned user was present in the room then he/she will be removed from the
+     * room and notified that he/she was banned along with the reason (if provided) and the bare
+     * XMPP user ID of the user who initiated the ban.
+     *
      * @param jids the bare XMPP user IDs of the users to ban.
      * @throws XMPPException if an error occurs banning a user. In particular, a
      *      405 error can occur if a moderator or a user with an affiliation of "owner" or "admin"
      *      was tried to be banned (i.e. Not Allowed error).
      */
-    public void banUsers(Collection jids) throws XMPPException {
+    public void banUsers(Collection<String> jids) throws XMPPException {
         changeAffiliationByAdmin(jids, "outcast");
     }
 
@@ -1127,12 +1124,12 @@ public class MultiUserChat {
     /**
      * Grants membership to other users. Only administrators are able to grant membership. A user
      * that becomes a room member will be able to enter a room of type Members-Only (i.e. a room
-     * that a user cannot enter without being on the member list). 
-     * 
+     * that a user cannot enter without being on the member list).
+     *
      * @param jids the XMPP user IDs of the users to grant membership.
      * @throws XMPPException if an error occurs granting membership to a user.
      */
-    public void grantMembership(Collection jids) throws XMPPException {
+    public void grantMembership(Collection<String> jids) throws XMPPException {
         changeAffiliationByAdmin(jids, "member");
     }
 
@@ -1151,13 +1148,13 @@ public class MultiUserChat {
     /**
      * Revokes users' membership. Only administrators are able to revoke membership. A user
      * that becomes a room member will be able to enter a room of type Members-Only (i.e. a room
-     * that a user cannot enter without being on the member list). If the user is in the room and 
+     * that a user cannot enter without being on the member list). If the user is in the room and
      * the room is of type members-only then the user will be removed from the room.
-     * 
+     *
      * @param jids the bare XMPP user IDs of the users to revoke membership.
      * @throws XMPPException if an error occurs revoking membership to a user.
      */
-    public void revokeMembership(Collection jids) throws XMPPException {
+    public void revokeMembership(Collection<String> jids) throws XMPPException {
         changeAffiliationByAdmin(jids, "none");
     }
 
@@ -1176,13 +1173,13 @@ public class MultiUserChat {
 
     /**
      * Grants moderator privileges to participants or visitors. Room administrators may grant
-     * moderator privileges. A moderator is allowed to kick users, grant and revoke voice, invite 
+     * moderator privileges. A moderator is allowed to kick users, grant and revoke voice, invite
      * other users, modify room's subject plus all the partcipants privileges.
-     *  
+     *
      * @param nicknames the nicknames of the occupants to grant moderator privileges.
      * @throws XMPPException if an error occurs granting moderator privileges to a user.
      */
-    public void grantModerator(Collection nicknames) throws XMPPException {
+    public void grantModerator(Collection<String> nicknames) throws XMPPException {
         changeRole(nicknames, "moderator");
     }
 
@@ -1201,13 +1198,13 @@ public class MultiUserChat {
     /**
      * Revokes moderator privileges from other users. The occupant that loses moderator
      * privileges will become a participant. Room administrators may revoke moderator privileges
-     * only to occupants whose affiliation is member or none. This means that an administrator is 
+     * only to occupants whose affiliation is member or none. This means that an administrator is
      * not allowed to revoke moderator privileges from other room administrators or owners.
-     *  
+     *
      * @param nicknames the nicknames of the occupants to revoke moderator privileges.
      * @throws XMPPException if an error occurs revoking moderator privileges from a user.
      */
-    public void revokeModerator(Collection nicknames) throws XMPPException {
+    public void revokeModerator(Collection<String> nicknames) throws XMPPException {
         changeRole(nicknames, "participant");
     }
 
@@ -1233,16 +1230,16 @@ public class MultiUserChat {
      * @param jids the collection of bare XMPP user IDs of the users to grant ownership.
      * @throws XMPPException if an error occurs granting ownership privileges to a user.
      */
-    public void grantOwnership(Collection jids) throws XMPPException {
+    public void grantOwnership(Collection<String> jids) throws XMPPException {
         changeAffiliationByOwner(jids, "owner");
     }
 
     /**
-     * Grants ownership privileges to another user. Room owners may grant ownership privileges. 
+     * Grants ownership privileges to another user. Room owners may grant ownership privileges.
      * Some room implementations will not allow to grant ownership privileges to other users.
-     * An owner is allowed to change defining room features as well as perform all administrative 
+     * An owner is allowed to change defining room features as well as perform all administrative
      * functions.
-     *  
+     *
      * @param jid the bare XMPP user ID of the user to grant ownership (e.g. "user@host.org").
      * @throws XMPPException if an error occurs granting ownership privileges to a user.
      */
@@ -1258,15 +1255,15 @@ public class MultiUserChat {
      * @param jids the bare XMPP user IDs of the users to revoke ownership.
      * @throws XMPPException if an error occurs revoking ownership privileges from a user.
      */
-    public void revokeOwnership(Collection jids) throws XMPPException {
+    public void revokeOwnership(Collection<String> jids) throws XMPPException {
         changeAffiliationByOwner(jids, "admin");
     }
 
     /**
-     * Revokes ownership privileges from another user. The occupant that loses ownership 
-     * privileges will become an administrator. Room owners may revoke ownership privileges. 
+     * Revokes ownership privileges from another user. The occupant that loses ownership
+     * privileges will become an administrator. Room owners may revoke ownership privileges.
      * Some room implementations will not allow to grant ownership privileges to other users.
-     *  
+     *
      * @param jid the bare XMPP user ID of the user to revoke ownership (e.g. "user@host.org").
      * @throws XMPPException if an error occurs revoking ownership privileges from a user.
      */
@@ -1282,16 +1279,16 @@ public class MultiUserChat {
      * @param jids the bare XMPP user IDs of the users to grant administrator privileges.
      * @throws XMPPException if an error occurs granting administrator privileges to a user.
      */
-    public void grantAdmin(Collection jids) throws XMPPException {
+    public void grantAdmin(Collection<String> jids) throws XMPPException {
         changeAffiliationByOwner(jids, "admin");
     }
 
     /**
-     * Grants administrator privileges to another user. Room owners may grant administrator 
-     * privileges to a member or unaffiliated user. An administrator is allowed to perform 
-     * administrative functions such as banning users and edit moderator list. 
-     *  
-     * @param jid the bare XMPP user ID of the user to grant administrator privileges 
+     * Grants administrator privileges to another user. Room owners may grant administrator
+     * privileges to a member or unaffiliated user. An administrator is allowed to perform
+     * administrative functions such as banning users and edit moderator list.
+     *
+     * @param jid the bare XMPP user ID of the user to grant administrator privileges
      * (e.g. "user@host.org").
      * @throws XMPPException if an error occurs granting administrator privileges to a user.
      */
@@ -1301,13 +1298,13 @@ public class MultiUserChat {
 
     /**
      * Revokes administrator privileges from users. The occupant that loses administrator
-     * privileges will become a member. Room owners may revoke administrator privileges from 
-     * a member or unaffiliated user. 
-     *  
+     * privileges will become a member. Room owners may revoke administrator privileges from
+     * a member or unaffiliated user.
+     *
      * @param jids the bare XMPP user IDs of the user to revoke administrator privileges.
      * @throws XMPPException if an error occurs revoking administrator privileges from a user.
      */
-    public void revokeAdmin(Collection jids) throws XMPPException {
+    public void revokeAdmin(Collection<String> jids) throws XMPPException {
         changeAffiliationByOwner(jids, "member");
     }
 
@@ -1351,15 +1348,15 @@ public class MultiUserChat {
         }
     }
 
-    private void changeAffiliationByOwner(Collection jids, String affiliation)
+    private void changeAffiliationByOwner(Collection<String> jids, String affiliation)
             throws XMPPException {
         MUCOwner iq = new MUCOwner();
         iq.setTo(room);
         iq.setType(IQ.Type.SET);
-        for (Iterator it=jids.iterator(); it.hasNext();) {
+        for (String jid : jids) {
             // Set the new affiliation.
             MUCOwner.Item item = new MUCOwner.Item(affiliation);
-            item.setJid((String) it.next());
+            item.setJid(jid);
             iq.addItem(item);
         }
 
@@ -1410,15 +1407,15 @@ public class MultiUserChat {
         }
     }
 
-    private void changeAffiliationByAdmin(Collection jids, String affiliation)
+    private void changeAffiliationByAdmin(Collection<String> jids, String affiliation)
             throws XMPPException {
         MUCAdmin iq = new MUCAdmin();
         iq.setTo(room);
         iq.setType(IQ.Type.SET);
-        for (Iterator it=jids.iterator(); it.hasNext();) {
+        for (String jid : jids) {
             // Set the new affiliation.
             MUCAdmin.Item item = new MUCAdmin.Item(affiliation, null);
-            item.setJid((String) it.next());
+            item.setJid(jid);
             iq.addItem(item);
         }
 
@@ -1468,14 +1465,14 @@ public class MultiUserChat {
         }
     }
 
-    private void changeRole(Collection nicknames, String role) throws XMPPException {
+    private void changeRole(Collection<String> nicknames, String role) throws XMPPException {
         MUCAdmin iq = new MUCAdmin();
         iq.setTo(room);
         iq.setType(IQ.Type.SET);
-        for (Iterator it=nicknames.iterator(); it.hasNext();) {
+        for (String nickname : nicknames) {
             // Set the new role.
             MUCAdmin.Item item = new MUCAdmin.Item(null, role);
-            item.setNick((String) it.next());
+            item.setNick(nickname);
             iq.addItem(item);
         }
 
@@ -1508,9 +1505,7 @@ public class MultiUserChat {
      * @return the number of occupants in the group chat.
      */
     public int getOccupantsCount() {
-        synchronized (occupantsMap) {
-            return occupantsMap.size();
-        }
+        return occupantsMap.size();
     }
 
     /**
@@ -1524,23 +1519,22 @@ public class MultiUserChat {
      *
      * @return an Iterator for the occupants in the group chat.
      */
-    public Iterator getOccupants() {
-        synchronized (occupantsMap) {
-            return Collections.unmodifiableList(new ArrayList(occupantsMap.keySet())).iterator();
-        }
+    public Iterator<String> getOccupants() {
+        return Collections.unmodifiableList(new ArrayList<String>(occupantsMap.keySet()))
+                .iterator();
     }
 
     /**
      * Returns the presence info for a particular user, or <tt>null</tt> if the user
      * is not in the room.<p>
-     * 
+     *
      * @param user the room occupant to search for his presence. The format of user must
      * be: roomName@service/nickname (e.g. darkcave@macbeth.shakespeare.lit/thirdwitch).
      * @return the occupant's current presence, or <tt>null</tt> if the user is unavailable
      *      or if no presence information is available.
      */
     public Presence getOccupantPresence(String user) {
-        return (Presence) occupantsMap.get(user);
+        return occupantsMap.get(user);
     }
 
     /**
@@ -1553,7 +1547,7 @@ public class MultiUserChat {
      * @return the Occupant or <tt>null</tt> if the user is unavailable (i.e. not in the room).
      */
     public Occupant getOccupant(String user) {
-        Presence presence = (Presence) occupantsMap.get(user);
+        Presence presence = occupantsMap.get(user);
         if (presence != null) {
             return new Occupant(presence);
         }
@@ -1592,7 +1586,7 @@ public class MultiUserChat {
      * @throws XMPPException if an error occured while performing the request to the server or you
      *         don't have enough privileges to get this information.
      */
-    public Collection getOwners() throws XMPPException {
+    public Collection<Affiliate> getOwners() throws XMPPException {
         return getAffiliatesByOwner("owner");
     }
 
@@ -1603,7 +1597,7 @@ public class MultiUserChat {
      * @throws XMPPException if an error occured while performing the request to the server or you
      *         don't have enough privileges to get this information.
      */
-    public Collection getAdmins() throws XMPPException {
+    public Collection<Affiliate> getAdmins() throws XMPPException {
         return getAffiliatesByOwner("admin");
     }
 
@@ -1614,7 +1608,7 @@ public class MultiUserChat {
      * @throws XMPPException if an error occured while performing the request to the server or you
      *         don't have enough privileges to get this information.
      */
-    public Collection getMembers() throws XMPPException {
+    public Collection<Affiliate> getMembers() throws XMPPException {
         return getAffiliatesByAdmin("member");
     }
 
@@ -1625,7 +1619,7 @@ public class MultiUserChat {
      * @throws XMPPException if an error occured while performing the request to the server or you
      *         don't have enough privileges to get this information.
      */
-    public Collection getOutcasts() throws XMPPException {
+    public Collection<Affiliate> getOutcasts() throws XMPPException {
         return getAffiliatesByAdmin("outcast");
     }
 
@@ -1638,7 +1632,7 @@ public class MultiUserChat {
      * @throws XMPPException if an error occured while performing the request to the server or you
      *         don't have enough privileges to get this information.
      */
-    private Collection getAffiliatesByOwner(String affiliation) throws XMPPException {
+    private Collection<Affiliate> getAffiliatesByOwner(String affiliation) throws XMPPException {
         MUCOwner iq = new MUCOwner();
         iq.setTo(room);
         iq.setType(IQ.Type.GET);
@@ -1663,7 +1657,7 @@ public class MultiUserChat {
             throw new XMPPException(answer.getError());
         }
         // Get the list of affiliates from the server's answer
-        List affiliates = new ArrayList();
+        List<Affiliate> affiliates = new ArrayList<Affiliate>();
         for (Iterator it = answer.getItems(); it.hasNext();) {
             affiliates.add(new Affiliate((MUCOwner.Item) it.next()));
         }
@@ -1679,7 +1673,7 @@ public class MultiUserChat {
      * @throws XMPPException if an error occured while performing the request to the server or you
      *         don't have enough privileges to get this information.
      */
-    private Collection getAffiliatesByAdmin(String affiliation) throws XMPPException {
+    private Collection<Affiliate> getAffiliatesByAdmin(String affiliation) throws XMPPException {
         MUCAdmin iq = new MUCAdmin();
         iq.setTo(room);
         iq.setType(IQ.Type.GET);
@@ -1704,7 +1698,7 @@ public class MultiUserChat {
             throw new XMPPException(answer.getError());
         }
         // Get the list of affiliates from the server's answer
-        List affiliates = new ArrayList();
+        List<Affiliate> affiliates = new ArrayList<Affiliate>();
         for (Iterator it = answer.getItems(); it.hasNext();) {
             affiliates.add(new Affiliate((MUCAdmin.Item) it.next()));
         }
@@ -1718,7 +1712,7 @@ public class MultiUserChat {
      * @throws XMPPException if an error occured while performing the request to the server or you
      *         don't have enough privileges to get this information.
      */
-    public Collection getModerators() throws XMPPException {
+    public Collection<Occupant> getModerators() throws XMPPException {
         return getOccupants("moderator");
     }
 
@@ -1729,7 +1723,7 @@ public class MultiUserChat {
      * @throws XMPPException if an error occured while performing the request to the server or you
      *         don't have enough privileges to get this information.
      */
-    public Collection getParticipants() throws XMPPException {
+    public Collection<Occupant> getParticipants() throws XMPPException {
         return getOccupants("participant");
     }
 
@@ -1741,7 +1735,7 @@ public class MultiUserChat {
      * @throws XMPPException if an error occured while performing the request to the server or you
      *         don't have enough privileges to get this information.
      */
-    private Collection getOccupants(String role) throws XMPPException {
+    private Collection<Occupant> getOccupants(String role) throws XMPPException {
         MUCAdmin iq = new MUCAdmin();
         iq.setTo(room);
         iq.setType(IQ.Type.GET);
@@ -1766,7 +1760,7 @@ public class MultiUserChat {
             throw new XMPPException(answer.getError());
         }
         // Get the list of participants from the server's answer
-        List participants = new ArrayList();
+        List<Occupant> participants = new ArrayList<Occupant>();
         for (Iterator it = answer.getItems(); it.hasNext();) {
             participants.add(new Occupant((MUCAdmin.Item) it.next()));
         }
@@ -1788,7 +1782,7 @@ public class MultiUserChat {
     /**
      * Returns a new Chat for sending private messages to a given room occupant.
      * The Chat's occupant address is the room's JID (i.e. roomName@service/nick). The server
-     * service will change the 'from' address to the sender's room JID and delivering the message 
+     * service will change the 'from' address to the sender's room JID and delivering the message
      * to the intended recipient's full JID.
      *
      * @param occupant occupant unique room JID (e.g. 'darkcave@macbeth.shakespeare.lit/Paul').
@@ -1883,12 +1877,12 @@ public class MultiUserChat {
     }
 
     /**
-     * Changes the subject within the room. As a default, only users with a role of "moderator" 
-     * are allowed to change the subject in a room. Although some rooms may be configured to 
+     * Changes the subject within the room. As a default, only users with a role of "moderator"
+     * are allowed to change the subject in a room. Although some rooms may be configured to
      * allow a mere participant or even a visitor to change the subject.
-     * 
-     * @param subject the new room's subject to set. 
-     * @throws XMPPException if someone without appropriate privileges attempts to change the 
+     *
+     * @param subject the new room's subject to set.
+     * @throws XMPPException if someone without appropriate privileges attempts to change the
      *          room subject will throw an error with code 403 (i.e. Forbidden)
      */
     public void changeSubject(final String subject) throws XMPPException {
@@ -1923,33 +1917,33 @@ public class MultiUserChat {
     }
 
     /**
-     * Notification message that the user has joined the room. 
+     * Notification message that the user has joined the room.
      */
     private synchronized void userHasJoined() {
         // Update the list of joined rooms through this connection
-        ArrayList rooms = (ArrayList)joinedRooms.get(connection);
+        List<String> rooms = joinedRooms.get(connection);
         if (rooms == null) {
-            rooms = new ArrayList();
+            rooms = new ArrayList<String>();
             joinedRooms.put(connection, rooms);
         }
         rooms.add(room);
     }
-    
+
     /**
-     * Notification message that the user has left the room. 
+     * Notification message that the user has left the room.
      */
     private synchronized void userHasLeft() {
         // Update the list of joined rooms through this connection
-        ArrayList rooms = (ArrayList)joinedRooms.get(connection);
+        List<String> rooms = joinedRooms.get(connection);
         if (rooms == null) {
             return;
         }
         rooms.remove(room);
     }
-    
+
     /**
      * Returns the MUCUser packet extension included in the packet or <tt>null</tt> if none.
-     * 
+     *
      * @param packet the packet that may include the MUCUser extension.
      * @return the MUCUser found in the packet.
      */
@@ -1962,8 +1956,8 @@ public class MultiUserChat {
     }
 
     /**
-     * Adds a listener that will be notified of changes in your status in the room 
-     * such as the user being kicked, banned, or granted admin permissions. 
+     * Adds a listener that will be notified of changes in your status in the room
+     * such as the user being kicked, banned, or granted admin permissions.
      *
      * @param listener a user status listener.
      */
@@ -1976,8 +1970,8 @@ public class MultiUserChat {
     }
 
     /**
-     * Removes a listener that was being notified of changes in your status in the room 
-     * such as the user being kicked, banned, or granted admin permissions. 
+     * Removes a listener that was being notified of changes in your status in the room
+     * such as the user being kicked, banned, or granted admin permissions.
      *
      * @param listener a user status listener.
      */
@@ -1988,7 +1982,7 @@ public class MultiUserChat {
     }
 
     private void fireUserStatusListeners(String methodName, Object[] params) {
-        UserStatusListener[] listeners = null;
+        UserStatusListener[] listeners;
         synchronized (userStatusListeners) {
             listeners = new UserStatusListener[userStatusListeners.size()];
             userStatusListeners.toArray(listeners);
@@ -2001,8 +1995,8 @@ public class MultiUserChat {
         try {
             // Get the method to execute based on the requested methodName and parameters classes
             Method method = UserStatusListener.class.getDeclaredMethod(methodName, paramClasses);
-            for (int i = 0; i < listeners.length; i++) {
-                method.invoke(listeners[i], params);
+            for (UserStatusListener listener : listeners) {
+                method.invoke(listener, params);
             }
         } catch (NoSuchMethodException e) {
             e.printStackTrace();
@@ -2015,7 +2009,7 @@ public class MultiUserChat {
 
     /**
      * Adds a listener that will be notified of changes in occupants status in the room
-     * such as the user being kicked, banned, or granted admin permissions. 
+     * such as the user being kicked, banned, or granted admin permissions.
      *
      * @param listener a participant status listener.
      */
@@ -2029,7 +2023,7 @@ public class MultiUserChat {
 
     /**
      * Removes a listener that was being notified of changes in occupants status in the room
-     * such as the user being kicked, banned, or granted admin permissions. 
+     * such as the user being kicked, banned, or granted admin permissions.
      *
      * @param listener a participant status listener.
      */
@@ -2039,8 +2033,8 @@ public class MultiUserChat {
         }
     }
 
-    private void fireParticipantStatusListeners(String methodName, List params) {
-        ParticipantStatusListener[] listeners = null;
+    private void fireParticipantStatusListeners(String methodName, List<String> params) {
+        ParticipantStatusListener[] listeners;
         synchronized (participantStatusListeners) {
             listeners = new ParticipantStatusListener[participantStatusListeners.size()];
             participantStatusListeners.toArray(listeners);
@@ -2052,8 +2046,8 @@ public class MultiUserChat {
                 classes[i] = String.class;
             }
             Method method = ParticipantStatusListener.class.getDeclaredMethod(methodName, classes);
-            for (int i = 0; i < listeners.length; i++) {
-                method.invoke(listeners[i], params.toArray());
+            for (ParticipantStatusListener listener : listeners) {
+                method.invoke(listener, params.toArray());
             }
         } catch (NoSuchMethodException e) {
             e.printStackTrace();
@@ -2063,9 +2057,9 @@ public class MultiUserChat {
             e.printStackTrace();
         }
     }
-    
+
     private void init() {
-        // Create a collector for incoming messages.
+        // Create filters
         messageFilter =
             new AndFilter(
                 new FromMatchesFilter(room),
@@ -2076,20 +2070,14 @@ public class MultiUserChat {
                 return msg.getBody() != null;
             }
         });
-        messageCollector = connection.createPacketCollector(messageFilter);
+        presenceFilter =
+            new AndFilter(new FromMatchesFilter(room), new PacketTypeFilter(Presence.class));
+
+        // Create a collector for incoming messages.
+        messageCollector = new ConnectionDetachedPacketCollector();
 
         // Create a listener for subject updates.
-        subjectFilter =
-            new AndFilter(
-                new FromMatchesFilter(room),
-                new MessageTypeFilter(Message.Type.GROUP_CHAT));
-        subjectFilter = new AndFilter(subjectFilter, new PacketFilter() {
-            public boolean accept(Packet packet) {
-                Message msg = (Message) packet;
-                return msg.getSubject() != null;
-            }
-        });
-        subjectListener = new PacketListener() {
+        PacketListener subjectListener = new PacketListener() {
             public void processPacket(Packet packet) {
                 Message msg = (Message) packet;
                 // Update the room subject
@@ -2098,34 +2086,27 @@ public class MultiUserChat {
                 fireSubjectUpdatedListeners(
                     msg.getSubject(),
                     msg.getFrom());
-                
+
             }
         };
-        connection.addPacketListener(subjectListener, subjectFilter);
 
         // Create a listener for all presence updates.
-        presenceFilter =
-            new AndFilter(new FromMatchesFilter(room), new PacketTypeFilter(Presence.class));
-        presenceListener = new PacketListener() {
+        PacketListener presenceListener = new PacketListener() {
             public void processPacket(Packet packet) {
                 Presence presence = (Presence) packet;
                 String from = presence.getFrom();
                 String myRoomJID = room + "/" + nickname;
                 boolean isUserStatusModification = presence.getFrom().equals(myRoomJID);
                 if (presence.getType() == Presence.Type.available) {
-                    Presence oldPresence;
-                    synchronized (occupantsMap) {
-                        oldPresence = (Presence)occupantsMap.get(from);
-                        occupantsMap.put(from, presence);
-                    }
+                    Presence oldPresence = occupantsMap.put(from, presence);
                     if (oldPresence != null) {
                         // Get the previous occupant's affiliation & role
                         MUCUser mucExtension = getMUCUserExtension(oldPresence);
-                        String oldAffiliation = mucExtension.getItem().getAffiliation(); 
+                        String oldAffiliation = mucExtension.getItem().getAffiliation();
                         String oldRole = mucExtension.getItem().getRole();
                         // Get the new occupant's affiliation & role
                         mucExtension = getMUCUserExtension(presence);
-                        String newAffiliation = mucExtension.getItem().getAffiliation(); 
+                        String newAffiliation = mucExtension.getItem().getAffiliation();
                         String newRole = mucExtension.getItem().getRole();
                         // Fire role modification events
                         checkRoleModifications(oldRole, newRole, isUserStatusModification, from);
@@ -2139,16 +2120,14 @@ public class MultiUserChat {
                     else {
                         // A new occupant has joined the room
                         if (!isUserStatusModification) {
-                            List params = new ArrayList();
+                            List<String> params = new ArrayList<String>();
                             params.add(from);
                             fireParticipantStatusListeners("joined", params);
                         }
                     }
                 }
                 else if (presence.getType() == Presence.Type.unavailable) {
-                    synchronized (occupantsMap) {
-                        occupantsMap.remove(from);
-                    }
+                    occupantsMap.remove(from);
                     MUCUser mucUser = getMUCUserExtension(presence);
                     if (mucUser != null && mucUser.getStatus() != null) {
                         // Fire events according to the received presence code
@@ -2160,7 +2139,7 @@ public class MultiUserChat {
                     } else {
                         // An occupant has left the room
                         if (!isUserStatusModification) {
-                            List params = new ArrayList();
+                            List<String> params = new ArrayList<String>();
                             params.add(from);
                             fireParticipantStatusListeners("left", params);
                         }
@@ -2168,12 +2147,10 @@ public class MultiUserChat {
                 }
             }
         };
-        connection.addPacketListener(presenceListener, presenceFilter);
 
-        // Listens for all messages that include a MUCUser extension and fire the invitation 
+        // Listens for all messages that include a MUCUser extension and fire the invitation
         // rejection listeners if the message includes an invitation rejection.
-        declinesFilter = new PacketExtensionFilter("x", "http://jabber.org/protocol/muc#user");
-        declinesListener = new PacketListener() {
+        PacketListener declinesListener = new PacketListener() {
             public void processPacket(Packet packet) {
                 // Get the MUC User extension
                 MUCUser mucUser = getMUCUserExtension(packet);
@@ -2185,23 +2162,30 @@ public class MultiUserChat {
                         mucUser.getDecline().getFrom(),
                         mucUser.getDecline().getReason());
                 }
-            };
+            }
         };
-        connection.addPacketListener(declinesListener, declinesFilter);
+
+        PacketMultiplexListener packetMultiplexor = new PacketMultiplexListener(
+                messageCollector, presenceListener, subjectListener,
+                declinesListener);
+
+        roomListenerMultiplexor = RoomListenerMultiplexor.getRoomMultiplexor(connection);
+
+        roomListenerMultiplexor.addRoom(room, packetMultiplexor);
     }
 
     /**
-     * Fires notification events if the role of a room occupant has changed. If the occupant that 
-     * changed his role is your occupant then the <code>UserStatusListeners</code> added to this 
-     * <code>MultiUserChat</code> will be fired. On the other hand, if the occupant that changed 
-     * his role is not yours then the <code>ParticipantStatusListeners</code> added to this 
-     * <code>MultiUserChat</code> will be fired. The following table shows the events that will 
+     * Fires notification events if the role of a room occupant has changed. If the occupant that
+     * changed his role is your occupant then the <code>UserStatusListeners</code> added to this
+     * <code>MultiUserChat</code> will be fired. On the other hand, if the occupant that changed
+     * his role is not yours then the <code>ParticipantStatusListeners</code> added to this
+     * <code>MultiUserChat</code> will be fired. The following table shows the events that will
      * be fired depending on the previous and new role of the occupant.
-     * 
+     *
      * <pre>
      * <table border="1">
      * <tr><td><b>Old</b></td><td><b>New</b></td><td><b>Events</b></td></tr>
-     * 
+     *
      * <tr><td>None</td><td>Visitor</td><td>--</td></tr>
      * <tr><td>Visitor</td><td>Participant</td><td>voiceGranted</td></tr>
      * <tr><td>Participant</td><td>Moderator</td><td>moderatorGranted</td></tr>
@@ -2209,7 +2193,7 @@ public class MultiUserChat {
      * <tr><td>None</td><td>Participant</td><td>voiceGranted</td></tr>
      * <tr><td>None</td><td>Moderator</td><td>voiceGranted + moderatorGranted</td></tr>
      * <tr><td>Visitor</td><td>Moderator</td><td>voiceGranted + moderatorGranted</td></tr>
-     * 
+     *
      * <tr><td>Moderator</td><td>Participant</td><td>moderatorRevoked</td></tr>
      * <tr><td>Participant</td><td>Visitor</td><td>voiceRevoked</td></tr>
      * <tr><td>Visitor</td><td>None</td><td>kicked</td></tr>
@@ -2219,7 +2203,7 @@ public class MultiUserChat {
      * <tr><td>Participant</td><td>None</td><td>kicked</td></tr>
      * </table>
      * </pre>
-     * 
+     *
      * @param oldRole the previous role of the user in the room before receiving the new presence
      * @param newRole the new role of the user in the room after receiving the new presence
      * @param isUserModification whether the received presence is about your user in the room or not
@@ -2238,7 +2222,7 @@ public class MultiUserChat {
                 fireUserStatusListeners("voiceGranted", new Object[] {});
             }
             else {
-                List params = new ArrayList();
+                List<String> params = new ArrayList<String>();
                 params.add(from);
                 fireParticipantStatusListeners("voiceGranted", params);
             }
@@ -2251,7 +2235,7 @@ public class MultiUserChat {
                 fireUserStatusListeners("voiceRevoked", new Object[] {});
             }
             else {
-                List params = new ArrayList();
+                List<String> params = new ArrayList<String>();
                 params.add(from);
                 fireParticipantStatusListeners("voiceRevoked", params);
             }
@@ -2263,7 +2247,7 @@ public class MultiUserChat {
                     fireUserStatusListeners("voiceGranted", new Object[] {});
                 }
                 else {
-                    List params = new ArrayList();
+                    List<String> params = new ArrayList<String>();
                     params.add(from);
                     fireParticipantStatusListeners("voiceGranted", params);
                 }
@@ -2272,7 +2256,7 @@ public class MultiUserChat {
                 fireUserStatusListeners("moderatorGranted", new Object[] {});
             }
             else {
-                List params = new ArrayList();
+                List<String> params = new ArrayList<String>();
                 params.add(from);
                 fireParticipantStatusListeners("moderatorGranted", params);
             }
@@ -2284,7 +2268,7 @@ public class MultiUserChat {
                     fireUserStatusListeners("voiceRevoked", new Object[] {});
                 }
                 else {
-                    List params = new ArrayList();
+                    List<String> params = new ArrayList<String>();
                     params.add(from);
                     fireParticipantStatusListeners("voiceRevoked", params);
                 }
@@ -2293,7 +2277,7 @@ public class MultiUserChat {
                 fireUserStatusListeners("moderatorRevoked", new Object[] {});
             }
             else {
-                List params = new ArrayList();
+                List<String> params = new ArrayList<String>();
                 params.add(from);
                 fireParticipantStatusListeners("moderatorRevoked", params);
             }
@@ -2301,22 +2285,22 @@ public class MultiUserChat {
     }
 
     /**
-     * Fires notification events if the affiliation of a room occupant has changed. If the 
-     * occupant that changed his affiliation is your occupant then the 
-     * <code>UserStatusListeners</code> added to this <code>MultiUserChat</code> will be fired. 
-     * On the other hand, if the occupant that changed his affiliation is not yours then the 
-     * <code>ParticipantStatusListeners</code> added to this <code>MultiUserChat</code> will be 
-     * fired. The following table shows the events that will be fired depending on the previous 
+     * Fires notification events if the affiliation of a room occupant has changed. If the
+     * occupant that changed his affiliation is your occupant then the
+     * <code>UserStatusListeners</code> added to this <code>MultiUserChat</code> will be fired.
+     * On the other hand, if the occupant that changed his affiliation is not yours then the
+     * <code>ParticipantStatusListeners</code> added to this <code>MultiUserChat</code> will be
+     * fired. The following table shows the events that will be fired depending on the previous
      * and new affiliation of the occupant.
-     * 
+     *
      * <pre>
      * <table border="1">
      * <tr><td><b>Old</b></td><td><b>New</b></td><td><b>Events</b></td></tr>
-     * 
+     *
      * <tr><td>None</td><td>Member</td><td>membershipGranted</td></tr>
      * <tr><td>Member</td><td>Admin</td><td>membershipRevoked + adminGranted</td></tr>
      * <tr><td>Admin</td><td>Owner</td><td>adminRevoked + ownershipGranted</td></tr>
-     * 
+     *
      * <tr><td>None</td><td>Admin</td><td>adminGranted</td></tr>
      * <tr><td>None</td><td>Owner</td><td>ownershipGranted</td></tr>
      * <tr><td>Member</td><td>Owner</td><td>membershipRevoked + ownershipGranted</td></tr>
@@ -2324,17 +2308,17 @@ public class MultiUserChat {
      * <tr><td>Owner</td><td>Admin</td><td>ownershipRevoked + adminGranted</td></tr>
      * <tr><td>Admin</td><td>Member</td><td>adminRevoked + membershipGranted</td></tr>
      * <tr><td>Member</td><td>None</td><td>membershipRevoked</td></tr>
-     * 
+     *
      * <tr><td>Owner</td><td>Member</td><td>ownershipRevoked + membershipGranted</td></tr>
      * <tr><td>Owner</td><td>None</td><td>ownershipRevoked</td></tr>
      * <tr><td>Admin</td><td>None</td><td>adminRevoked</td></tr>
      * <tr><td><i>Anyone</i></td><td>Outcast</td><td>banned</td></tr>
      * </table>
      * </pre>
-     * 
-     * @param oldAffiliation the previous affiliation of the user in the room before receiving the 
+     *
+     * @param oldAffiliation the previous affiliation of the user in the room before receiving the
      * new presence
-     * @param newAffiliation the new affiliation of the user in the room after receiving the new 
+     * @param newAffiliation the new affiliation of the user in the room after receiving the new
      * presence
      * @param isUserModification whether the received presence is about your user in the room or not
      * @param from the occupant whose role in the room has changed
@@ -2347,14 +2331,14 @@ public class MultiUserChat {
         String from) {
         // First check for revoked affiliation and then for granted affiliations. The idea is to
         // first fire the "revoke" events and then fire the "grant" events.
-        
+
         // The user's ownership to the room was revoked
         if ("owner".equals(oldAffiliation) && !"owner".equals(newAffiliation)) {
             if (isUserModification) {
                 fireUserStatusListeners("ownershipRevoked", new Object[] {});
             }
             else {
-                List params = new ArrayList();
+                List<String> params = new ArrayList<String>();
                 params.add(from);
                 fireParticipantStatusListeners("ownershipRevoked", params);
             }
@@ -2365,7 +2349,7 @@ public class MultiUserChat {
                 fireUserStatusListeners("adminRevoked", new Object[] {});
             }
             else {
-                List params = new ArrayList();
+                List<String> params = new ArrayList<String>();
                 params.add(from);
                 fireParticipantStatusListeners("adminRevoked", params);
             }
@@ -2376,7 +2360,7 @@ public class MultiUserChat {
                 fireUserStatusListeners("membershipRevoked", new Object[] {});
             }
             else {
-                List params = new ArrayList();
+                List<String> params = new ArrayList<String>();
                 params.add(from);
                 fireParticipantStatusListeners("membershipRevoked", params);
             }
@@ -2388,7 +2372,7 @@ public class MultiUserChat {
                 fireUserStatusListeners("ownershipGranted", new Object[] {});
             }
             else {
-                List params = new ArrayList();
+                List<String> params = new ArrayList<String>();
                 params.add(from);
                 fireParticipantStatusListeners("ownershipGranted", params);
             }
@@ -2399,7 +2383,7 @@ public class MultiUserChat {
                 fireUserStatusListeners("adminGranted", new Object[] {});
             }
             else {
-                List params = new ArrayList();
+                List<String> params = new ArrayList<String>();
                 params.add(from);
                 fireParticipantStatusListeners("adminGranted", params);
             }
@@ -2410,7 +2394,7 @@ public class MultiUserChat {
                 fireUserStatusListeners("membershipGranted", new Object[] {});
             }
             else {
-                List params = new ArrayList();
+                List<String> params = new ArrayList<String>();
                 params.add(from);
                 fireParticipantStatusListeners("membershipGranted", params);
             }
@@ -2419,7 +2403,7 @@ public class MultiUserChat {
 
     /**
      * Fires events according to the received presence code.
-     * 
+     *
      * @param code
      * @param isUserModification
      * @param mucUser
@@ -2441,19 +2425,19 @@ public class MultiUserChat {
                     new Object[] { mucUser.getItem().getActor(), mucUser.getItem().getReason()});
 
                 // Reset occupant information.
-                occupantsMap = new HashMap();
+                occupantsMap.clear();
                 nickname = null;
                 userHasLeft();
             }
             else {
-                List params = new ArrayList();
+                List<String> params = new ArrayList<String>();
                 params.add(from);
                 params.add(mucUser.getItem().getActor());
                 params.add(mucUser.getItem().getReason());
                 fireParticipantStatusListeners("kicked", params);
             }
         }
-        // A user was banned from the room 
+        // A user was banned from the room
         else if ("301".equals(code)) {
             // Check if this occupant was banned
             if (isUserModification) {
@@ -2464,19 +2448,19 @@ public class MultiUserChat {
                     new Object[] { mucUser.getItem().getActor(), mucUser.getItem().getReason()});
 
                 // Reset occupant information.
-                occupantsMap = new HashMap();
+                occupantsMap.clear();
                 nickname = null;
                 userHasLeft();
             }
             else {
-                List params = new ArrayList();
+                List<String> params = new ArrayList<String>();
                 params.add(from);
                 params.add(mucUser.getItem().getActor());
                 params.add(mucUser.getItem().getReason());
                 fireParticipantStatusListeners("banned", params);
             }
         }
-        // A user's membership was revoked from the room 
+        // A user's membership was revoked from the room
         else if ("321".equals(code)) {
             // Check if this occupant's membership was revoked
             if (isUserModification) {
@@ -2485,14 +2469,14 @@ public class MultiUserChat {
                 fireUserStatusListeners("membershipRevoked", new Object[] {});
 
                 // Reset occupant information.
-                occupantsMap = new HashMap();
+                occupantsMap.clear();
                 nickname = null;
                 userHasLeft();
             }
         }
         // A occupant has changed his nickname in the room
         else if ("303".equals(code)) {
-            List params = new ArrayList();
+            List<String> params = new ArrayList<String>();
             params.add(from);
             params.add(mucUser.getItem().getNick());
             fireParticipantStatusListeners("nicknameChanged", params);
@@ -2503,17 +2487,16 @@ public class MultiUserChat {
         super.finalize();
         try {
             if (connection != null) {
-                messageCollector.cancel();
-                connection.removePacketListener(subjectListener);
-                connection.removePacketListener(presenceListener);
-                connection.removePacketListener(declinesListener);
+                roomListenerMultiplexor.removeRoom(room);
                 // Remove all the PacketListeners added to the connection by this chat
-                for (Iterator it=connectionListeners.iterator(); it.hasNext();) {
-                    connection.removePacketListener((PacketListener) it.next());
+                for (PacketListener connectionListener : connectionListeners) {
+                    connection.removePacketListener(connectionListener);
                 }
             }
         }
-        catch (Exception e) {}
+        catch (Exception e) {
+            // Do nothing
+        }
     }
 
     /**
@@ -2525,9 +2508,11 @@ public class MultiUserChat {
     private static class InvitationsMonitor implements ConnectionListener {
         // We use a WeakHashMap so that the GC can collect the monitor when the
         // connection is no longer referenced by any object.
-        private static Map monitors = new WeakHashMap();
+        private final static Map<XMPPConnection, WeakReference<InvitationsMonitor>> monitors =
+                new WeakHashMap<XMPPConnection, WeakReference<InvitationsMonitor>>();
 
-        private List invitationsListeners = new ArrayList();
+        private final List<InvitationListener> invitationsListeners =
+                new ArrayList<InvitationListener>();
         private XMPPConnection connection;
         private PacketFilter invitationFilter;
         private PacketListener invitationPacketListener;
@@ -2544,10 +2529,10 @@ public class MultiUserChat {
                     // We need to use a WeakReference because the monitor references the 
                     // connection and this could prevent the GC from collecting the monitor
                     // when no other object references the monitor
-                    monitors.put(conn, new WeakReference(new InvitationsMonitor(conn)));
+                    monitors.put(conn, new WeakReference<InvitationsMonitor>(new InvitationsMonitor(conn)));
                 }
                 // Return the InvitationsMonitor that monitors the connection
-                return (InvitationsMonitor) ((WeakReference) monitors.get(conn)).get();
+                return monitors.get(conn).get();
             }
         }
 
@@ -2611,13 +2596,13 @@ public class MultiUserChat {
          */
         private void fireInvitationListeners(String room, String inviter, String reason, String password,
                                              Message message) {
-            InvitationListener[] listeners = null;
+            InvitationListener[] listeners;
             synchronized (invitationsListeners) {
                 listeners = new InvitationListener[invitationsListeners.size()];
                 invitationsListeners.toArray(listeners);
             }
-            for (int i = 0; i < listeners.length; i++) {
-                listeners[i].invitationReceived(connection, room, inviter, reason, password, message);
+            for (InvitationListener listener : listeners) {
+                listener.invitationReceived(connection, room, inviter, reason, password, message);
             }
         }
 
@@ -2652,7 +2637,7 @@ public class MultiUserChat {
                         fireInvitationListeners(packet.getFrom(), mucUser.getInvite().getFrom(),
                                 mucUser.getInvite().getReason(), mucUser.getPassword(), (Message) packet);
                     }
-                };
+                }
             };
             connection.addPacketListener(invitationPacketListener, invitationFilter);
             // Add a listener to detect when the connection gets closed in order to
diff --git a/source/org/jivesoftware/smackx/muc/RoomInfo.java b/source/org/jivesoftware/smackx/muc/RoomInfo.java
index 694dd38d8..513e1ce90 100644
--- a/source/org/jivesoftware/smackx/muc/RoomInfo.java
+++ b/source/org/jivesoftware/smackx/muc/RoomInfo.java
@@ -20,8 +20,8 @@
 
 package org.jivesoftware.smackx.muc;
 
-import org.jivesoftware.smackx.packet.DiscoverInfo;
 import org.jivesoftware.smackx.Form;
+import org.jivesoftware.smackx.packet.DiscoverInfo;
 
 /**
  * Represents the room information that was discovered using Service Discovery. It's possible to
@@ -87,10 +87,10 @@ public class RoomInfo {
         Form form = Form.getFormFrom(info);
         if (form != null) {
             this.description =
-                    (String) form.getField("muc#roominfo_description").getValues().next();
-            this.subject = (String) form.getField("muc#roominfo_subject").getValues().next();
+                    form.getField("muc#roominfo_description").getValues().next();
+            this.subject = form.getField("muc#roominfo_subject").getValues().next();
             this.occupantsCount =
-                    Integer.parseInt((String) form.getField("muc#roominfo_occupants").getValues()
+                    Integer.parseInt(form.getField("muc#roominfo_occupants").getValues()
                     .next());
         }
     }
diff --git a/source/org/jivesoftware/smackx/packet/Bytestream.java b/source/org/jivesoftware/smackx/packet/Bytestream.java
index 4987cacab..1c14214ff 100644
--- a/source/org/jivesoftware/smackx/packet/Bytestream.java
+++ b/source/org/jivesoftware/smackx/packet/Bytestream.java
@@ -223,7 +223,7 @@ public class Bytestream extends IQ {
     }
 
     public String getChildElementXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
 
         buf.append("<query xmlns=\"http://jabber.org/protocol/bytestreams\"");
         if (this.getType().equals(IQ.Type.SET)) {
@@ -337,7 +337,7 @@ public class Bytestream extends IQ {
         }
 
         public String toXML() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
 
             buf.append("<").append(getElementName()).append(" ");
             buf.append("jid=\"").append(getJID()).append("\" ");
@@ -394,7 +394,7 @@ public class Bytestream extends IQ {
         }
 
         public String toXML() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("<").append(getElementName()).append(" ");
             buf.append("jid=\"").append(getJID()).append("\" ");
             buf.append("/>");
@@ -443,7 +443,7 @@ public class Bytestream extends IQ {
         }
 
         public String toXML() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("<").append(getElementName()).append(">");
             buf.append(getTarget());
             buf.append("</").append(getElementName()).append(">");
diff --git a/source/org/jivesoftware/smackx/packet/DataForm.java b/source/org/jivesoftware/smackx/packet/DataForm.java
index 82b2939cc..8fd4268a8 100644
--- a/source/org/jivesoftware/smackx/packet/DataForm.java
+++ b/source/org/jivesoftware/smackx/packet/DataForm.java
@@ -20,14 +20,14 @@
 
 package org.jivesoftware.smackx.packet;
 
+import org.jivesoftware.smack.packet.PacketExtension;
+import org.jivesoftware.smackx.FormField;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import org.jivesoftware.smack.packet.PacketExtension;
-import org.jivesoftware.smackx.FormField;
-
 /**
  * Represents a form that could be use for gathering data as well as for reporting data
  * returned from a search.
@@ -38,10 +38,10 @@ public class DataForm implements PacketExtension {
 
     private String type;
     private String title;
-    private List instructions = new ArrayList();
+    private List<String> instructions = new ArrayList<String>();
     private ReportedData reportedData;
-    private List items = new ArrayList();
-    private List fields = new ArrayList();
+    private final List<Item> items = new ArrayList<Item>();
+    private final List<FormField> fields = new ArrayList<FormField>();
     
     public DataForm(String type) {
         this.type = type;
@@ -85,9 +85,9 @@ public class DataForm implements PacketExtension {
      * 
      * @return an Iterator for the list of instructions that explain how to fill out the form.
      */
-    public Iterator getInstructions() {
+    public Iterator<String> getInstructions() {
         synchronized (instructions) {
-            return Collections.unmodifiableList(new ArrayList(instructions)).iterator();
+            return Collections.unmodifiableList(new ArrayList<String>(instructions)).iterator();
         }
     }
 
@@ -105,9 +105,9 @@ public class DataForm implements PacketExtension {
      *
      * @return an Iterator for the items returned from a search.
      */
-    public Iterator getItems() {
+    public Iterator<Item> getItems() {
         synchronized (items) {
-            return Collections.unmodifiableList(new ArrayList(items)).iterator();
+            return Collections.unmodifiableList(new ArrayList<Item>(items)).iterator();
         }
     }
 
@@ -116,9 +116,9 @@ public class DataForm implements PacketExtension {
      *
      * @return an Iterator for the fields that are part of the form.
      */
-    public Iterator getFields() {
+    public Iterator<FormField> getFields() {
         synchronized (fields) {
-            return Collections.unmodifiableList(new ArrayList(fields)).iterator();
+            return Collections.unmodifiableList(new ArrayList<FormField>(fields)).iterator();
         }
     }
 
@@ -147,7 +147,7 @@ public class DataForm implements PacketExtension {
      * 
      * @param instructions list of instructions that explain how to fill out the form.
      */
-    public void setInstructions(List instructions) {
+    public void setInstructions(List<String> instructions) {
         this.instructions = instructions;
     }
 
@@ -196,7 +196,7 @@ public class DataForm implements PacketExtension {
     }
 
     public String toXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<").append(getElementName()).append(" xmlns=\"").append(getNamespace()).append(
             "\" type=\"" + getType() +"\">");
         if (getTitle() != null) {
@@ -231,9 +231,9 @@ public class DataForm implements PacketExtension {
      * @author Gaston Dombiak
      */
     public static class ReportedData {
-        private List fields = new ArrayList();
+        private List<FormField> fields = new ArrayList<FormField>();
         
-        public ReportedData(List fields) {
+        public ReportedData(List<FormField> fields) {
             this.fields = fields;
         }
         
@@ -242,12 +242,12 @@ public class DataForm implements PacketExtension {
          * 
          * @return the fields returned from a search.
          */
-        public Iterator getFields() {
-            return Collections.unmodifiableList(new ArrayList(fields)).iterator();
+        public Iterator<FormField> getFields() {
+            return Collections.unmodifiableList(new ArrayList<FormField>(fields)).iterator();
         }
         
         public String toXML() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("<reported>");
             // Loop through all the form items and append them to the string buffer
             for (Iterator i = getFields(); i.hasNext();) {
@@ -266,9 +266,9 @@ public class DataForm implements PacketExtension {
      * @author Gaston Dombiak
      */
     public static class Item {
-        private List fields = new ArrayList();
+        private List<FormField> fields = new ArrayList<FormField>();
         
-        public Item(List fields) {
+        public Item(List<FormField> fields) {
             this.fields = fields;
         }
         
@@ -277,12 +277,12 @@ public class DataForm implements PacketExtension {
          * 
          * @return the fields that define the data that goes with the item.
          */
-        public Iterator getFields() {
-            return Collections.unmodifiableList(new ArrayList(fields)).iterator();
+        public Iterator<FormField> getFields() {
+            return Collections.unmodifiableList(new ArrayList<FormField>(fields)).iterator();
         }
         
         public String toXML() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("<item>");
             // Loop through all the form items and append them to the string buffer
             for (Iterator i = getFields(); i.hasNext();) {
diff --git a/source/org/jivesoftware/smackx/packet/DefaultPrivateData.java b/source/org/jivesoftware/smackx/packet/DefaultPrivateData.java
index c000d2eed..e7edf700c 100644
--- a/source/org/jivesoftware/smackx/packet/DefaultPrivateData.java
+++ b/source/org/jivesoftware/smackx/packet/DefaultPrivateData.java
@@ -20,10 +20,10 @@
 
 package org.jivesoftware.smackx.packet;
 
-import java.util.Map;
-import java.util.Iterator;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 
 /**
  * Default implementation of the PrivateData interface. Unless a PrivateDataProvider
@@ -83,7 +83,7 @@ public class DefaultPrivateData implements PrivateData {
     }
 
     public String toXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<").append(elementName).append(" xmlns=\"").append(namespace).append("\">");
         for (Iterator i=getNames(); i.hasNext(); ) {
             String name = (String)i.next();
diff --git a/source/org/jivesoftware/smackx/packet/DelayInformation.java b/source/org/jivesoftware/smackx/packet/DelayInformation.java
index c04409b3a..cdad8386a 100644
--- a/source/org/jivesoftware/smackx/packet/DelayInformation.java
+++ b/source/org/jivesoftware/smackx/packet/DelayInformation.java
@@ -20,12 +20,12 @@
 
 package org.jivesoftware.smackx.packet;
 
+import org.jivesoftware.smack.packet.PacketExtension;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.TimeZone;
 
-import org.jivesoftware.smack.packet.PacketExtension;
-
 /**
  * Represents timestamp information about data stored for later delivery. A DelayInformation will 
  * always includes the timestamp when the packet was originally sent and may include more 
@@ -124,7 +124,7 @@ public class DelayInformation implements PacketExtension {
     }
 
     public String toXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<").append(getElementName()).append(" xmlns=\"").append(getNamespace()).append(
                 "\"");
         buf.append(" stamp=\"");
diff --git a/source/org/jivesoftware/smackx/packet/DiscoverInfo.java b/source/org/jivesoftware/smackx/packet/DiscoverInfo.java
index 0694a0ceb..2f031bf6c 100644
--- a/source/org/jivesoftware/smackx/packet/DiscoverInfo.java
+++ b/source/org/jivesoftware/smackx/packet/DiscoverInfo.java
@@ -20,10 +20,13 @@
 
 package org.jivesoftware.smackx.packet;
 
-import java.util.*;
-
 import org.jivesoftware.smack.packet.IQ;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
 /**
  * A DiscoverInfo IQ packet, which is used by XMPP clients to request and receive information 
  * to/from other XMPP entities.<p> 
@@ -35,8 +38,8 @@ import org.jivesoftware.smack.packet.IQ;
  */
 public class DiscoverInfo extends IQ {
 
-    private List features = new ArrayList();
-    private List identities = new ArrayList();
+    private final List<Feature> features = new ArrayList<Feature>();
+    private final List<Identity> identities = new ArrayList<Identity>();
     private String node;
 
     /**
@@ -59,9 +62,9 @@ public class DiscoverInfo extends IQ {
      *
      * @return an Iterator on the discovered features of an XMPP entity
      */
-    Iterator getFeatures() {
+    Iterator<Feature> getFeatures() {
         synchronized (features) {
-            return Collections.unmodifiableList(new ArrayList(features)).iterator();
+            return Collections.unmodifiableList(new ArrayList<Feature>(features)).iterator();
         }
     }
 
@@ -81,9 +84,9 @@ public class DiscoverInfo extends IQ {
      * 
      * @return an Iterator on the discoveted identities 
      */
-    public Iterator getIdentities() {
+    public Iterator<Identity> getIdentities() {
         synchronized (identities) {
-            return Collections.unmodifiableList(new ArrayList(identities)).iterator();
+            return Collections.unmodifiableList(new ArrayList<Identity>(identities)).iterator();
         }
     }
 
@@ -120,15 +123,15 @@ public class DiscoverInfo extends IQ {
      * @return true if the requestes feature has been discovered
      */
     public boolean containsFeature(String feature) {
-        for (Iterator it = getFeatures(); it.hasNext();) {
-            if (feature.equals(((DiscoverInfo.Feature) it.next()).getVar()))
+        for (Iterator<Feature> it = getFeatures(); it.hasNext();) {
+            if (feature.equals(it.next().getVar()))
                 return true;
         }
         return false;
     }
 
     public String getChildElementXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<query xmlns=\"http://jabber.org/protocol/disco#info\"");
         if (getNode() != null) {
             buf.append(" node=\"");
@@ -137,14 +140,12 @@ public class DiscoverInfo extends IQ {
         }
         buf.append(">");
         synchronized (identities) {
-            for (int i = 0; i < identities.size(); i++) {
-                Identity identity = (Identity) identities.get(i);
+            for (Identity identity : identities) {
                 buf.append(identity.toXML());
             }
         }
         synchronized (features) {
-            for (int i = 0; i < features.size(); i++) {
-                Feature feature = (Feature) features.get(i);
+            for (Feature feature : features) {
                 buf.append(feature.toXML());
             }
         }
@@ -220,7 +221,7 @@ public class DiscoverInfo extends IQ {
         }
 
         public String toXML() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("<identity category=\"").append(category).append("\"");
             buf.append(" name=\"").append(name).append("\"");
             if (type != null) {
@@ -260,7 +261,7 @@ public class DiscoverInfo extends IQ {
         }
 
         public String toXML() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("<feature var=\"").append(variable).append("\"/>");
             return buf.toString();
         }
diff --git a/source/org/jivesoftware/smackx/packet/DiscoverItems.java b/source/org/jivesoftware/smackx/packet/DiscoverItems.java
index 0c264aea9..372db0223 100644
--- a/source/org/jivesoftware/smackx/packet/DiscoverItems.java
+++ b/source/org/jivesoftware/smackx/packet/DiscoverItems.java
@@ -20,10 +20,13 @@
 
 package org.jivesoftware.smackx.packet;
 
-import java.util.*;
-
 import org.jivesoftware.smack.packet.IQ;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
 /**
  * A DiscoverItems IQ packet, which is used by XMPP clients to request and receive items 
  * associated with XMPP entities.<p>
@@ -35,7 +38,7 @@ import org.jivesoftware.smack.packet.IQ;
  */
 public class DiscoverItems extends IQ {
 
-    private List items = new ArrayList();
+    private final List<DiscoverItems.Item> items = new ArrayList<DiscoverItems.Item>();
     private String node;
 
     /**
@@ -54,9 +57,10 @@ public class DiscoverItems extends IQ {
      *
      * @return an Iterator on the discovered entity's items
      */
-    public Iterator getItems() {
+    public Iterator<DiscoverItems.Item> getItems() {
         synchronized (items) {
-            return Collections.unmodifiableList(new ArrayList(items)).iterator();
+            return Collections.unmodifiableList(new ArrayList<DiscoverItems.Item>(items))
+                    .iterator();
         }
     }
 
@@ -87,7 +91,7 @@ public class DiscoverItems extends IQ {
     }
 
     public String getChildElementXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<query xmlns=\"http://jabber.org/protocol/disco#items\"");
         if (getNode() != null) {
             buf.append(" node=\"");
@@ -97,7 +101,7 @@ public class DiscoverItems extends IQ {
         buf.append(">");
         synchronized (items) {
             for (int i = 0; i < items.size(); i++) {
-                Item item = (Item) items.get(i);
+                Item item = items.get(i);
                 buf.append(item.toXML());
             }
         }
@@ -217,7 +221,7 @@ public class DiscoverItems extends IQ {
         }
 
         public String toXML() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("<item jid=\"").append(entityID).append("\"");
             if (name != null) {
                 buf.append(" name=\"").append(name).append("\"");
diff --git a/source/org/jivesoftware/smackx/packet/IBBExtensions.java b/source/org/jivesoftware/smackx/packet/IBBExtensions.java
index 80bfb5719..3873cd492 100644
--- a/source/org/jivesoftware/smackx/packet/IBBExtensions.java
+++ b/source/org/jivesoftware/smackx/packet/IBBExtensions.java
@@ -93,7 +93,7 @@ public class IBBExtensions {
 		}
 
 		public String getChildElementXML() {
-			StringBuffer buf = new StringBuffer();
+			StringBuilder buf = new StringBuilder();
             buf.append("<").append(getElementName()).append(" xmlns=\"").append(getNamespace()).append("\" ");
             buf.append("sid=\"").append(getSessionID()).append("\" ");
             buf.append("block-size=\"").append(getBlockSize()).append("\"");
@@ -193,7 +193,7 @@ public class IBBExtensions {
 		}
 
 		public String toXML() {
-			StringBuffer buf = new StringBuffer();
+			StringBuilder buf = new StringBuilder();
             buf.append("<").append(getElementName()).append(" xmlns=\"").append(getNamespace())
                     .append("\" ");
             buf.append("sid=\"").append(getSessionID()).append("\" ");
@@ -230,7 +230,7 @@ public class IBBExtensions {
 		}
 
 		public String getChildElementXML() {
-			StringBuffer buf = new StringBuffer();
+			StringBuilder buf = new StringBuilder();
             buf.append("<").append(getElementName()).append(" xmlns=\"").append(getNamespace()).append("\" ");
             buf.append("sid=\"").append(getSessionID()).append("\"");
 			buf.append("/>");
diff --git a/source/org/jivesoftware/smackx/packet/LastActivity.java b/source/org/jivesoftware/smackx/packet/LastActivity.java
index 9dd0e76b5..d3005377e 100644
--- a/source/org/jivesoftware/smackx/packet/LastActivity.java
+++ b/source/org/jivesoftware/smackx/packet/LastActivity.java
@@ -25,10 +25,10 @@ import org.jivesoftware.smack.PacketCollector;
 import org.jivesoftware.smack.SmackConfiguration;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
-import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.filter.PacketIDFilter;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.util.StringUtils;
 import org.xmlpull.v1.XmlPullParser;
 
 /**
@@ -56,7 +56,7 @@ public class LastActivity extends IQ {
     }
 
     public String getChildElementXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<query xmlns=\"jabber:iq:last\"></query>");
         return buf.toString();
     }
diff --git a/source/org/jivesoftware/smackx/packet/MUCAdmin.java b/source/org/jivesoftware/smackx/packet/MUCAdmin.java
index f1e877296..f30dad22f 100644
--- a/source/org/jivesoftware/smackx/packet/MUCAdmin.java
+++ b/source/org/jivesoftware/smackx/packet/MUCAdmin.java
@@ -19,10 +19,13 @@
  */
 
 package org.jivesoftware.smackx.packet;
-import java.util.*;
-
 import org.jivesoftware.smack.packet.IQ;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
 /**
  * IQ packet that serves for kicking users, granting and revoking voice, banning users, 
  * modifying the ban list, granting and revoking membership and granting and revoking 
@@ -60,7 +63,7 @@ public class MUCAdmin extends IQ {
     }
 
     public String getChildElementXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<query xmlns=\"http://jabber.org/protocol/muc#admin\">");
         synchronized (items) {
             for (int i = 0; i < items.size(); i++) {
@@ -201,7 +204,7 @@ public class MUCAdmin extends IQ {
         }
 
         public String toXML() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("<item");
             if (getAffiliation() != null) {
                 buf.append(" affiliation=\"").append(getAffiliation()).append("\"");
diff --git a/source/org/jivesoftware/smackx/packet/MUCInitialPresence.java b/source/org/jivesoftware/smackx/packet/MUCInitialPresence.java
index 88ba7f29b..218001e08 100644
--- a/source/org/jivesoftware/smackx/packet/MUCInitialPresence.java
+++ b/source/org/jivesoftware/smackx/packet/MUCInitialPresence.java
@@ -20,12 +20,12 @@
 
 package org.jivesoftware.smackx.packet;
 
+import org.jivesoftware.smack.packet.PacketExtension;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.TimeZone;
 
-import org.jivesoftware.smack.packet.PacketExtension;
-
 /**
  * Represents extended presence information whose sole purpose is to signal the ability of 
  * the occupant to speak the MUC protocol when joining a room. If the room requires a password 
@@ -52,7 +52,7 @@ public class MUCInitialPresence implements PacketExtension {
     }
 
     public String toXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<").append(getElementName()).append(" xmlns=\"").append(getNamespace()).append(
             "\">");
         if (getPassword() != null) {
@@ -200,7 +200,7 @@ public class MUCInitialPresence implements PacketExtension {
         }
 
         public String toXML() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("<history");
             if (getMaxChars() != -1) {
                 buf.append(" maxchars=\"").append(getMaxChars()).append("\"");
diff --git a/source/org/jivesoftware/smackx/packet/MUCOwner.java b/source/org/jivesoftware/smackx/packet/MUCOwner.java
index 626746884..eb4d14960 100644
--- a/source/org/jivesoftware/smackx/packet/MUCOwner.java
+++ b/source/org/jivesoftware/smackx/packet/MUCOwner.java
@@ -19,10 +19,13 @@
  */
 
 package org.jivesoftware.smackx.packet;
-import java.util.*;
-
 import org.jivesoftware.smack.packet.IQ;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
 /**
  * IQ packet that serves for granting and revoking ownership privileges, granting 
  * and revoking administrative privileges and destroying a room. All these operations 
@@ -82,7 +85,7 @@ public class MUCOwner extends IQ {
     }
 
     public String getChildElementXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<query xmlns=\"http://jabber.org/protocol/muc#owner\">");
         synchronized (items) {
             for (int i = 0; i < items.size(); i++) {
@@ -237,7 +240,7 @@ public class MUCOwner extends IQ {
         }
 
         public String toXML() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("<item");
             if (getAffiliation() != null) {
                 buf.append(" affiliation=\"").append(getAffiliation()).append("\"");
@@ -317,7 +320,7 @@ public class MUCOwner extends IQ {
         }
 
         public String toXML() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("<destroy");
             if (getJid() != null) {
                 buf.append(" jid=\"").append(getJid()).append("\"");
diff --git a/source/org/jivesoftware/smackx/packet/MUCUser.java b/source/org/jivesoftware/smackx/packet/MUCUser.java
index 7e84cea6b..10cecde11 100644
--- a/source/org/jivesoftware/smackx/packet/MUCUser.java
+++ b/source/org/jivesoftware/smackx/packet/MUCUser.java
@@ -46,7 +46,7 @@ public class MUCUser implements PacketExtension {
     }
 
     public String toXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<").append(getElementName()).append(" xmlns=\"").append(getNamespace()).append(
             "\">");
         if (getInvite() != null) {
@@ -261,7 +261,7 @@ public class MUCUser implements PacketExtension {
         }
 
         public String toXML() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("<invite ");
             if (getTo() != null) {
                 buf.append(" to=\"").append(getTo()).append("\"");
@@ -346,7 +346,7 @@ public class MUCUser implements PacketExtension {
         }
 
         public String toXML() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("<decline ");
             if (getTo() != null) {
                 buf.append(" to=\"").append(getTo()).append("\"");
@@ -490,7 +490,7 @@ public class MUCUser implements PacketExtension {
         }
 
         public String toXML() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("<item");
             if (getAffiliation() != null) {
                 buf.append(" affiliation=\"").append(getAffiliation()).append("\"");
@@ -550,7 +550,7 @@ public class MUCUser implements PacketExtension {
         }
 
         public String toXML() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("<status code=\"").append(getCode()).append("\"/>");
             return buf.toString();
         }
@@ -605,7 +605,7 @@ public class MUCUser implements PacketExtension {
         }
 
         public String toXML() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("<destroy");
             if (getJid() != null) {
                 buf.append(" jid=\"").append(getJid()).append("\"");
diff --git a/source/org/jivesoftware/smackx/packet/MessageEvent.java b/source/org/jivesoftware/smackx/packet/MessageEvent.java
index 617e9d14e..f8455b8c2 100644
--- a/source/org/jivesoftware/smackx/packet/MessageEvent.java
+++ b/source/org/jivesoftware/smackx/packet/MessageEvent.java
@@ -20,10 +20,11 @@
 
 package org.jivesoftware.smackx.packet;
 
-import java.util.*;
-
 import org.jivesoftware.smack.packet.PacketExtension;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+
 /**
  * Represents message events relating to the delivery, display, composition and cancellation of 
  * messages.<p>
@@ -303,7 +304,7 @@ public class MessageEvent implements PacketExtension {
      * 
      */
     public String toXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<").append(getElementName()).append(" xmlns=\"").append(getNamespace()).append(
             "\">");
         // Note: Cancellation events don't specify any tag. They just send the packetID
diff --git a/source/org/jivesoftware/smackx/packet/MultipleAddresses.java b/source/org/jivesoftware/smackx/packet/MultipleAddresses.java
index 6481127f2..3601a9964 100644
--- a/source/org/jivesoftware/smackx/packet/MultipleAddresses.java
+++ b/source/org/jivesoftware/smackx/packet/MultipleAddresses.java
@@ -105,7 +105,7 @@ public class MultipleAddresses implements PacketExtension {
     }
 
     public String toXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<").append(getElementName());
         buf.append(" xmlns=\"").append(getNamespace()).append("\">");
         // Loop through all the addresses and append them to the string buffer
@@ -175,7 +175,7 @@ public class MultipleAddresses implements PacketExtension {
         }
 
         private String toXML() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("<address type=\"");
             // Append the address type (e.g. TO/CC/BCC)
             buf.append(type).append("\"");
diff --git a/source/org/jivesoftware/smackx/packet/OfflineMessageInfo.java b/source/org/jivesoftware/smackx/packet/OfflineMessageInfo.java
index 90c1ead71..735759d95 100644
--- a/source/org/jivesoftware/smackx/packet/OfflineMessageInfo.java
+++ b/source/org/jivesoftware/smackx/packet/OfflineMessageInfo.java
@@ -79,7 +79,7 @@ public class OfflineMessageInfo implements PacketExtension {
     }
 
     public String toXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<").append(getElementName()).append(" xmlns=\"").append(getNamespace()).append(
             "\">");
         if (getNode() != null)
diff --git a/source/org/jivesoftware/smackx/packet/OfflineMessageRequest.java b/source/org/jivesoftware/smackx/packet/OfflineMessageRequest.java
index 9b726e3c6..686b1c479 100644
--- a/source/org/jivesoftware/smackx/packet/OfflineMessageRequest.java
+++ b/source/org/jivesoftware/smackx/packet/OfflineMessageRequest.java
@@ -102,7 +102,7 @@ public class OfflineMessageRequest extends IQ {
     }
 
     public String getChildElementXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<offline xmlns=\"http://jabber.org/protocol/offline\">");
         synchronized (items) {
             for (int i = 0; i < items.size(); i++) {
@@ -175,7 +175,7 @@ public class OfflineMessageRequest extends IQ {
         }
 
         public String toXML() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("<item");
             if (getAction() != null) {
                 buf.append(" action=\"").append(getAction()).append("\"");
diff --git a/source/org/jivesoftware/smackx/packet/RosterExchange.java b/source/org/jivesoftware/smackx/packet/RosterExchange.java
index 40597e83e..8eb3eb83c 100644
--- a/source/org/jivesoftware/smackx/packet/RosterExchange.java
+++ b/source/org/jivesoftware/smackx/packet/RosterExchange.java
@@ -20,11 +20,16 @@
 
 package org.jivesoftware.smackx.packet;
 
-import java.util.*;
-
-import org.jivesoftware.smack.*;
+import org.jivesoftware.smack.Roster;
+import org.jivesoftware.smack.RosterEntry;
+import org.jivesoftware.smack.RosterGroup;
 import org.jivesoftware.smack.packet.PacketExtension;
-import org.jivesoftware.smackx.*;
+import org.jivesoftware.smackx.RemoteRosterEntry;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * Represents XMPP Roster Item Exchange packets.<p>
@@ -161,7 +166,7 @@ public class RosterExchange implements PacketExtension {
      * 
      */
     public String toXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<").append(getElementName()).append(" xmlns=\"").append(getNamespace()).append(
             "\">");
         // Loop through all roster entries and append them to the string buffer
diff --git a/source/org/jivesoftware/smackx/packet/SharedGroupsInfo.java b/source/org/jivesoftware/smackx/packet/SharedGroupsInfo.java
index b6e0b535a..ff0be41ef 100644
--- a/source/org/jivesoftware/smackx/packet/SharedGroupsInfo.java
+++ b/source/org/jivesoftware/smackx/packet/SharedGroupsInfo.java
@@ -31,7 +31,7 @@ public class SharedGroupsInfo extends IQ {
     }
 
     public String getChildElementXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<sharedgroup xmlns=\"http://www.jivesoftware.org/protocol/sharedgroup\">");
         for (Iterator it=groups.iterator(); it.hasNext();) {
             buf.append("<group>").append(it.next()).append("</group>");
diff --git a/source/org/jivesoftware/smackx/packet/StreamInitiation.java b/source/org/jivesoftware/smackx/packet/StreamInitiation.java
index e615964d7..15b73a2e9 100644
--- a/source/org/jivesoftware/smackx/packet/StreamInitiation.java
+++ b/source/org/jivesoftware/smackx/packet/StreamInitiation.java
@@ -134,7 +134,7 @@ public class StreamInitiation extends IQ {
       * @see org.jivesoftware.smack.packet.IQ#getChildElementXML()
       */
     public String getChildElementXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         if (this.getType().equals(IQ.Type.SET)) {
             buf.append("<si xmlns=\"http://jabber.org/protocol/si\" ");
             if (getSessionID() != null) {
@@ -333,7 +333,7 @@ public class StreamInitiation extends IQ {
         }
 
         public String toXML() {
-            StringBuffer buffer = new StringBuffer();
+            StringBuilder buffer = new StringBuilder();
 
             buffer.append("<").append(getElementName()).append(" xmlns=\"")
                     .append(getNamespace()).append("\" ");
@@ -408,7 +408,7 @@ public class StreamInitiation extends IQ {
         }
 
         public String toXML() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf
                     .append("<feature xmlns=\"http://jabber.org/protocol/feature-neg\">");
 			buf.append(data.toXML());
diff --git a/source/org/jivesoftware/smackx/packet/Time.java b/source/org/jivesoftware/smackx/packet/Time.java
index 9ceea620f..041c23319 100644
--- a/source/org/jivesoftware/smackx/packet/Time.java
+++ b/source/org/jivesoftware/smackx/packet/Time.java
@@ -22,9 +22,11 @@ package org.jivesoftware.smackx.packet;
 
 import org.jivesoftware.smack.packet.IQ;
 
-import java.util.*;
-import java.text.SimpleDateFormat;
 import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
 
 /**
  * A Time IQ packet, which is used by XMPP clients to exchange their respective local
@@ -179,7 +181,7 @@ public class Time extends IQ {
     }
 
     public String getChildElementXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<query xmlns=\"jabber:iq:time\">");
         if (utc != null) {
             buf.append("<utc>").append(utc).append("</utc>");
diff --git a/source/org/jivesoftware/smackx/packet/VCard.java b/source/org/jivesoftware/smackx/packet/VCard.java
index 99e753e25..7664edfd2 100644
--- a/source/org/jivesoftware/smackx/packet/VCard.java
+++ b/source/org/jivesoftware/smackx/packet/VCard.java
@@ -26,8 +26,8 @@ import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.filter.PacketIDFilter;
 import org.jivesoftware.smack.packet.IQ;
-import org.jivesoftware.smack.packet.XMPPError;
 import org.jivesoftware.smack.packet.Packet;
+import org.jivesoftware.smack.packet.XMPPError;
 import org.jivesoftware.smack.util.StringUtils;
 
 import java.io.BufferedInputStream;
@@ -89,8 +89,8 @@ public class VCard extends IQ {
      * Phone types:
      * VOICE?, FAX?, PAGER?, MSG?, CELL?, VIDEO?, BBS?, MODEM?, ISDN?, PCS?, PREF?
      */
-    private Map homePhones = new HashMap();
-    private Map workPhones = new HashMap();
+    private Map<String, String> homePhones = new HashMap<String, String>();
+    private Map<String, String> workPhones = new HashMap<String, String>();
 
 
     /**
@@ -98,8 +98,8 @@ public class VCard extends IQ {
      * POSTAL?, PARCEL?, (DOM | INTL)?, PREF?, POBOX?, EXTADR?, STREET?, LOCALITY?,
      * REGION?, PCODE?, CTRY?
      */
-    private Map homeAddr = new HashMap();
-    private Map workAddr = new HashMap();
+    private Map<String, String> homeAddr = new HashMap<String, String>();
+    private Map<String, String> workAddr = new HashMap<String, String>();
 
     private String firstName;
     private String lastName;
@@ -116,10 +116,10 @@ public class VCard extends IQ {
     /**
      * Such as DESC ROLE GEO etc.. see JEP-0054
      */
-    private Map otherSimpleFields = new HashMap();
+    private Map<String, String> otherSimpleFields = new HashMap<String, String>();
 
     // fields that, as they are should not be escaped before forwarding to the server
-    private Map otherUnescapableFields = new HashMap();
+    private Map<String, String> otherUnescapableFields = new HashMap<String, String>();
 
     public VCard() {
     }
@@ -131,7 +131,7 @@ public class VCard extends IQ {
      *              GEO, TITLE, ROLE, LOGO, NOTE, PRODID, REV, SORT-STRING, SOUND, UID, URL, DESC.
      */
     public String getField(String field) {
-        return (String) otherSimpleFields.get(field);
+        return otherSimpleFields.get(field);
     }
 
     /**
@@ -168,6 +168,8 @@ public class VCard extends IQ {
 
     public void setFirstName(String firstName) {
         this.firstName = firstName;
+        // Update FN field
+        updateFN();
     }
 
     public String getLastName() {
@@ -176,6 +178,8 @@ public class VCard extends IQ {
 
     public void setLastName(String lastName) {
         this.lastName = lastName;
+        // Update FN field
+        updateFN();
     }
 
     public String getMiddleName() {
@@ -184,10 +188,12 @@ public class VCard extends IQ {
 
     public void setMiddleName(String middleName) {
         this.middleName = middleName;
+        // Update FN field
+        updateFN();
     }
 
     public String getNickName() {
-        return (String) otherSimpleFields.get("NICKNAME");
+        return otherSimpleFields.get("NICKNAME");
     }
 
     public void setNickName(String nickName) {
@@ -211,7 +217,7 @@ public class VCard extends IQ {
     }
 
     public String getJabberId() {
-        return (String) otherSimpleFields.get("JABBERID");
+        return otherSimpleFields.get("JABBERID");
     }
 
     public void setJabberId(String jabberId) {
@@ -241,7 +247,7 @@ public class VCard extends IQ {
      *                  LOCALITY, REGION, PCODE, CTRY
      */
     public String getAddressFieldHome(String addrField) {
-        return (String) homeAddr.get(addrField);
+        return homeAddr.get(addrField);
     }
 
     /**
@@ -261,7 +267,7 @@ public class VCard extends IQ {
      *                  LOCALITY, REGION, PCODE, CTRY
      */
     public String getAddressFieldWork(String addrField) {
-        return (String) workAddr.get(addrField);
+        return workAddr.get(addrField);
     }
 
     /**
@@ -291,7 +297,7 @@ public class VCard extends IQ {
      * @param phoneType one of VOICE, FAX, PAGER, MSG, CELL, VIDEO, BBS, MODEM, ISDN, PCS, PREF
      */
     public String getPhoneHome(String phoneType) {
-        return (String) homePhones.get(phoneType);
+        return homePhones.get(phoneType);
     }
 
     /**
@@ -310,7 +316,7 @@ public class VCard extends IQ {
      * @param phoneType one of VOICE, FAX, PAGER, MSG, CELL, VIDEO, BBS, MODEM, ISDN, PCS, PREF
      */
     public String getPhoneWork(String phoneType) {
-        return (String) workPhones.get(phoneType);
+        return workPhones.get(phoneType);
     }
 
     /**
@@ -442,6 +448,20 @@ public class VCard extends IQ {
         return StringUtils.encodeHex(digest.digest());
     }
 
+    private void updateFN() {
+        StringBuilder sb = new StringBuilder();
+        if (firstName != null) {
+            sb.append(StringUtils.escapeForXML(firstName)).append(' ');
+        }
+        if (middleName != null) {
+            sb.append(StringUtils.escapeForXML(middleName)).append(' ');
+        }
+        if (lastName != null) {
+            sb.append(StringUtils.escapeForXML(lastName));
+        }
+        setField("FN", sb.toString());
+    }
+
     /**
      * Save this vCard for the user connected by 'connection'. Connection should be authenticated
      * and not anonymous.<p>
@@ -516,7 +536,7 @@ public class VCard extends IQ {
     }
 
     public String getChildElementXML() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         new VCardWriter(sb).write();
         return sb.toString();
     }
@@ -525,8 +545,7 @@ public class VCard extends IQ {
         if (result == null) result = new VCard();
 
         Field[] fields = VCard.class.getDeclaredFields();
-        for (int i = 0; i < fields.length; i++) {
-            Field field = fields[i];
+        for (Field field : fields) {
             if (field.getDeclaringClass() == VCard.class &&
                     !Modifier.isFinal(field.getModifiers())) {
                 try {
@@ -647,9 +666,9 @@ public class VCard extends IQ {
 
     private class VCardWriter {
 
-        private final StringBuffer sb;
+        private final StringBuilder sb;
 
-        VCardWriter(StringBuffer sb) {
+        VCardWriter(StringBuilder sb) {
             this.sb = sb;
         }
 
@@ -663,7 +682,6 @@ public class VCard extends IQ {
 
         private void buildActualContent() {
             if (hasNameField()) {
-                appendFN();
                 appendN();
             }
 
@@ -693,7 +711,7 @@ public class VCard extends IQ {
             }
         }
 
-        private void appendPhones(Map phones, final String code) {
+        private void appendPhones(Map<String, String> phones, final String code) {
             Iterator it = phones.entrySet().iterator();
             while (it.hasNext()) {
                 final Map.Entry entry = (Map.Entry) it.next();
@@ -707,7 +725,7 @@ public class VCard extends IQ {
             }
         }
 
-        private void appendAddress(final Map addr, final String code) {
+        private void appendAddress(final Map<String, String> addr, final String code) {
             if (addr.size() > 0) {
                 appendTag("ADR", true, new ContentBuilder() {
                     public void addTagContent() {
@@ -753,23 +771,6 @@ public class VCard extends IQ {
             }
         }
 
-        private void appendFN() {
-            final ContentBuilder contentBuilder = new ContentBuilder() {
-                public void addTagContent() {
-                    if (firstName != null) {
-                        sb.append(StringUtils.escapeForXML(firstName)).append(' ');
-                    }
-                    if (middleName != null) {
-                        sb.append(StringUtils.escapeForXML(middleName)).append(' ');
-                    }
-                    if (lastName != null) {
-                        sb.append(StringUtils.escapeForXML(lastName));
-                    }
-                }
-            };
-            appendTag("FN", true, contentBuilder);
-        }
-
         private void appendN() {
             appendTag("N", true, new ContentBuilder() {
                 public void addTagContent() {
diff --git a/source/org/jivesoftware/smackx/packet/Version.java b/source/org/jivesoftware/smackx/packet/Version.java
index 206208f3f..30aafe756 100644
--- a/source/org/jivesoftware/smackx/packet/Version.java
+++ b/source/org/jivesoftware/smackx/packet/Version.java
@@ -115,7 +115,7 @@ public class Version extends IQ {
     }
 
     public String getChildElementXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<query xmlns=\"jabber:iq:version\">");
         if (name != null) {
             buf.append("<name>").append(name).append("</name>");
diff --git a/source/org/jivesoftware/smackx/packet/XHTMLExtension.java b/source/org/jivesoftware/smackx/packet/XHTMLExtension.java
index 6bf266569..9bef15028 100644
--- a/source/org/jivesoftware/smackx/packet/XHTMLExtension.java
+++ b/source/org/jivesoftware/smackx/packet/XHTMLExtension.java
@@ -20,10 +20,13 @@
 
 package org.jivesoftware.smackx.packet;
 
-import java.util.*;
-
 import org.jivesoftware.smack.packet.PacketExtension;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
 /**
  * An XHTML sub-packet, which is used by XMPP clients to exchange formatted text. The XHTML 
  * extension is only a subset of XHTML 1.0.<p>
@@ -78,7 +81,7 @@ public class XHTMLExtension implements PacketExtension {
      * 
      */
     public String toXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<").append(getElementName()).append(" xmlns=\"").append(getNamespace()).append(
             "\">");
         // Loop through all the bodies and append them to the string buffer
diff --git a/source/org/jivesoftware/smackx/provider/BytestreamsProvider.java b/source/org/jivesoftware/smackx/provider/BytestreamsProvider.java
index 462d3d9be..c67432cc0 100644
--- a/source/org/jivesoftware/smackx/provider/BytestreamsProvider.java
+++ b/source/org/jivesoftware/smackx/provider/BytestreamsProvider.java
@@ -47,7 +47,7 @@ public class BytestreamsProvider implements IQProvider {
 	 * @see org.jivesoftware.smack.provider.IQProvider#parseIQ(org.xmlpull.v1.XmlPullParser)
 	 */
 	public IQ parseIQ(XmlPullParser parser) throws Exception {
-		// StringBuffer buf = new StringBuffer();
+		// StringBuilder buf = new StringBuilder();
 		boolean done = false;
 
 		Bytestream toReturn = new Bytestream();
diff --git a/source/org/jivesoftware/smackx/provider/DataFormProvider.java b/source/org/jivesoftware/smackx/provider/DataFormProvider.java
index 325a9ce2d..00914ab6b 100644
--- a/source/org/jivesoftware/smackx/provider/DataFormProvider.java
+++ b/source/org/jivesoftware/smackx/provider/DataFormProvider.java
@@ -20,15 +20,15 @@
 
 package org.jivesoftware.smackx.provider;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.jivesoftware.smack.packet.PacketExtension;
 import org.jivesoftware.smack.provider.PacketExtensionProvider;
 import org.jivesoftware.smackx.FormField;
 import org.jivesoftware.smackx.packet.DataForm;
 import org.xmlpull.v1.XmlPullParser;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * The DataFormProvider parses DataForm packets.
  * 
@@ -45,7 +45,7 @@ public class DataFormProvider implements PacketExtensionProvider {
 
     public PacketExtension parseExtension(XmlPullParser parser) throws Exception {
         boolean done = false;
-        StringBuffer buffer = null;
+        StringBuilder buffer = null;
         DataForm dataForm = new DataForm(parser.getAttributeValue("", "type"));
         while (!done) {
             int eventType = parser.next();
diff --git a/source/org/jivesoftware/smackx/provider/VCardProvider.java b/source/org/jivesoftware/smackx/provider/VCardProvider.java
index 42195c977..ce8a70302 100644
--- a/source/org/jivesoftware/smackx/provider/VCardProvider.java
+++ b/source/org/jivesoftware/smackx/provider/VCardProvider.java
@@ -32,8 +32,8 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * vCard provider.
@@ -45,7 +45,7 @@ public class VCardProvider implements IQProvider {
     private final static String PREFERRED_ENCODING = "UTF-8";
 
   public IQ parseIQ(XmlPullParser parser) throws Exception {
-      StringBuffer sb = new StringBuffer();
+      StringBuilder sb = new StringBuilder();
       try {
           int event = parser.getEventType();
           // get the content
@@ -229,12 +229,12 @@ public class VCardProvider implements IQProvider {
         }
 
         private String getTextContent(Node node) {
-            StringBuffer result = new StringBuffer();
+            StringBuilder result = new StringBuilder();
             appendText(result, node);
             return result.toString();
         }
 
-        private void appendText(StringBuffer result, Node node) {
+        private void appendText(StringBuilder result, Node node) {
             NodeList childNodes = node.getChildNodes();
             for (int i = 0; i < childNodes.getLength(); i++) {
                 Node nd = childNodes.item(i);
diff --git a/source/org/jivesoftware/smackx/provider/XHTMLExtensionProvider.java b/source/org/jivesoftware/smackx/provider/XHTMLExtensionProvider.java
index 1eb09181f..9342c6245 100644
--- a/source/org/jivesoftware/smackx/provider/XHTMLExtensionProvider.java
+++ b/source/org/jivesoftware/smackx/provider/XHTMLExtensionProvider.java
@@ -51,7 +51,7 @@ public class XHTMLExtensionProvider implements PacketExtensionProvider {
         throws Exception {
         XHTMLExtension xhtmlExtension = new XHTMLExtension();
         boolean done = false;
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         int startDepth = parser.getDepth();
         int depth = parser.getDepth();
         String lastTag = "";
@@ -59,7 +59,7 @@ public class XHTMLExtensionProvider implements PacketExtensionProvider {
             int eventType = parser.next();
             if (eventType == XmlPullParser.START_TAG) {
                 if (parser.getName().equals("body")) {
-                    buffer = new StringBuffer();
+                    buffer = new StringBuilder();
                     depth = parser.getDepth();
                 }
                 lastTag = parser.getText();
diff --git a/source/org/jivesoftware/smackx/search/SimpleUserSearch.java b/source/org/jivesoftware/smackx/search/SimpleUserSearch.java
index 9566a66dd..442dc3d99 100644
--- a/source/org/jivesoftware/smackx/search/SimpleUserSearch.java
+++ b/source/org/jivesoftware/smackx/search/SimpleUserSearch.java
@@ -42,7 +42,7 @@ class SimpleUserSearch extends IQ {
 
 
     public String getChildElementXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<query xmlns=\"jabber:iq:search\">");
         buf.append(getItemsToSearch());
         buf.append("</query>");
@@ -50,7 +50,7 @@ class SimpleUserSearch extends IQ {
     }
 
     private String getItemsToSearch() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
 
         if (form == null) {
             form = Form.getFormFrom(this);
@@ -60,9 +60,9 @@ class SimpleUserSearch extends IQ {
             return "";
         }
 
-        Iterator fields = form.getFields();
+        Iterator<FormField> fields = form.getFields();
         while (fields.hasNext()) {
-            FormField field = (FormField) fields.next();
+            FormField field = fields.next();
             String name = field.getVariable();
             String value = getSingleValue(field);
             if (value.trim().length() > 0) {
@@ -74,9 +74,9 @@ class SimpleUserSearch extends IQ {
     }
 
     private static String getSingleValue(FormField formField) {
-        Iterator values = formField.getValues();
+        Iterator<String> values = formField.getValues();
         while (values.hasNext()) {
-            return (String) values.next();
+            return values.next();
         }
         return "";
     }
@@ -87,11 +87,11 @@ class SimpleUserSearch extends IQ {
 
         boolean done = false;
 
-        List fields = new ArrayList();
+        List<ReportedData.Field> fields = new ArrayList<ReportedData.Field>();
         while (!done) {
             if (parser.getAttributeCount() > 0) {
                 String jid = parser.getAttributeValue("", "jid");
-                List valueList = new ArrayList();
+                List<String> valueList = new ArrayList<String>();
                 valueList.add(jid);
                 ReportedData.Field field = new ReportedData.Field("jid", valueList);
                 fields.add(field);
@@ -100,7 +100,7 @@ class SimpleUserSearch extends IQ {
             int eventType = parser.next();
 
             if (eventType == XmlPullParser.START_TAG && parser.getName().equals("item")) {
-                fields = new ArrayList();
+                fields = new ArrayList<ReportedData.Field>();
             }
             else if (eventType == XmlPullParser.END_TAG && parser.getName().equals("item")) {
                 ReportedData.Row row = new ReportedData.Row(fields);
@@ -110,7 +110,7 @@ class SimpleUserSearch extends IQ {
                 String name = parser.getName();
                 String value = parser.nextText();
 
-                List valueList = new ArrayList();
+                List<String> valueList = new ArrayList<String>();
                 valueList.add(value);
                 ReportedData.Field field = new ReportedData.Field(name, valueList);
                 fields.add(field);
diff --git a/source/org/jivesoftware/smackx/search/UserSearch.java b/source/org/jivesoftware/smackx/search/UserSearch.java
index 993ac59e1..e716edfe1 100644
--- a/source/org/jivesoftware/smackx/search/UserSearch.java
+++ b/source/org/jivesoftware/smackx/search/UserSearch.java
@@ -43,7 +43,7 @@ public class UserSearch extends IQ {
     }
 
     public String getChildElementXML() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<query xmlns=\"jabber:iq:search\">");
         buf.append(getExtensionsXML());
         buf.append("</query>");
diff --git a/test/org/jivesoftware/smack/IQTest.java b/test/org/jivesoftware/smack/IQTest.java
index 3db04417e..41ee37703 100644
--- a/test/org/jivesoftware/smack/IQTest.java
+++ b/test/org/jivesoftware/smack/IQTest.java
@@ -20,12 +20,12 @@
 
 package org.jivesoftware.smack;
 
-import org.jivesoftware.smack.test.SmackTestCase;
-import org.jivesoftware.smack.packet.IQ;
-import org.jivesoftware.smack.filter.PacketFilter;
 import org.jivesoftware.smack.filter.AndFilter;
+import org.jivesoftware.smack.filter.PacketFilter;
 import org.jivesoftware.smack.filter.PacketIDFilter;
 import org.jivesoftware.smack.filter.PacketTypeFilter;
+import org.jivesoftware.smack.packet.IQ;
+import org.jivesoftware.smack.test.SmackTestCase;
 
 /**
  * Ensure that the server is handling IQ packets correctly.
@@ -45,7 +45,7 @@ public class IQTest extends SmackTestCase {
     public void testInvalidNamespace() {
         IQ iq = new IQ() {
             public String getChildElementXML() {
-                StringBuffer buf = new StringBuffer();
+                StringBuilder buf = new StringBuilder();
                 buf.append("<query xmlns=\"jabber:iq:anything\">");
                 buf.append("</query>");
                 return buf.toString();
diff --git a/test/org/jivesoftware/smack/MessageTest.java b/test/org/jivesoftware/smack/MessageTest.java
index 937914fdf..4d8164ae2 100644
--- a/test/org/jivesoftware/smack/MessageTest.java
+++ b/test/org/jivesoftware/smack/MessageTest.java
@@ -20,10 +20,10 @@
 
 package org.jivesoftware.smack;
 
-import org.jivesoftware.smack.test.SmackTestCase;
-import org.jivesoftware.smack.packet.Presence;
-import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.filter.MessageTypeFilter;
+import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smack.packet.Presence;
+import org.jivesoftware.smack.test.SmackTestCase;
 
 /**
  * Tests sending messages to other clients.
@@ -82,7 +82,7 @@ public class MessageTest extends SmackTestCase {
 
         // Create message with a body of 4K characters
         Message msg = new Message(getFullJID(1), Message.Type.CHAT);
-        StringBuffer sb = new StringBuffer(5000);
+        StringBuilder sb = new StringBuilder(5000);
         for (int i=0; i<=4000; i++) {
             sb.append("X");
         }
diff --git a/test/org/jivesoftware/smack/RosterTest.java b/test/org/jivesoftware/smack/RosterTest.java
index cab15c917..5e369f5e8 100644
--- a/test/org/jivesoftware/smack/RosterTest.java
+++ b/test/org/jivesoftware/smack/RosterTest.java
@@ -89,8 +89,10 @@ public class RosterTest extends SmackTestCase {
 
             // Wait until the server confirms the new entries
             long initial = System.currentTimeMillis();
-            while (System.currentTimeMillis() - initial < 2000 && roster.getEntryCount() != 2) {
-                Thread.sleep(50);
+            while (System.currentTimeMillis() - initial < 2000 && (
+                    roster.getPresence(getBareJID(1)) == null ||
+                            roster.getPresence(getBareJID(2)) == null)) {
+                Thread.sleep(100);
             }
 
             for (RosterEntry entry : roster.getEntries()) {
@@ -210,11 +212,25 @@ public class RosterTest extends SmackTestCase {
             roster.createEntry(getBareJID(1), "gato11", null);
             roster.createEntry(getBareJID(2), "gato12", null);
 
+            // Wait up to 2 seconds to let the server process presence subscriptions
+            long initial = System.currentTimeMillis();
+            while (System.currentTimeMillis() - initial < 2000 && (
+                    roster.getPresence(getBareJID(1)) == null ||
+                            roster.getPresence(getBareJID(2)) == null)) {
+                Thread.sleep(100);
+            }
+
             Thread.sleep(200);
 
             for (RosterEntry entry : roster.getEntries()) {
                 roster.removeEntry(entry);
-                Thread.sleep(250);
+                Thread.sleep(100);
+            }
+
+            // Wait up to 2 seconds to receive roster removal notifications
+            initial = System.currentTimeMillis();
+            while (System.currentTimeMillis() - initial < 2000  && roster.getEntryCount() != 0) {
+                Thread.sleep(100);
             }
 
             assertEquals("Wrong number of entries in connection 0", 0, roster.getEntryCount());
@@ -247,7 +263,12 @@ public class RosterTest extends SmackTestCase {
             Roster roster = getConnection(0).getRoster();
             roster.createEntry(getBareJID(1), null, null);
 
-            Thread.sleep(200);
+            // Wait up to 2 seconds to let the server process presence subscriptions
+            long initial = System.currentTimeMillis();
+            while (System.currentTimeMillis() - initial < 2000 &&
+                    roster.getPresence(getBareJID(1)) == null) {
+                Thread.sleep(100);
+            }
 
             // Change the roster entry name and check if the change was made
             for (RosterEntry entry : roster.getEntries()) {
@@ -388,12 +409,18 @@ public class RosterTest extends SmackTestCase {
             roster.createEntry(getBareJID(1), "gato11", new String[] { "Friends" });
             roster.createEntry(getBareJID(2), "gato12", new String[] { "Friends" });
 
-            Thread.sleep(200);
+            // Wait up to 2 seconds to let the server process presence subscriptions
+            long initial = System.currentTimeMillis();
+            while (System.currentTimeMillis() - initial < 2000 && (
+                    roster.getPresence(getBareJID(1)) == null ||
+                            roster.getPresence(getBareJID(2)) == null)) {
+                Thread.sleep(100);
+            }
 
             roster.getGroup("Friends").setName("Amigos");
 
             // Wait up to 2 seconds
-            long initial = System.currentTimeMillis();
+            initial = System.currentTimeMillis();
             while (System.currentTimeMillis() - initial < 2000 &&
                     (roster.getGroup("Friends") != null)) {
                 Thread.sleep(100);
@@ -440,77 +467,71 @@ public class RosterTest extends SmackTestCase {
     /**
      * Test presence management.
      */
-    public void testRosterPresences() {
-        try {
-            Thread.sleep(200);
+    public void testRosterPresences() throws Exception {
+        Thread.sleep(200);
 
-            Presence presence;
+        Presence presence;
 
-            // Create another connection for the same user of connection 1
-            XMPPConnection conn4 = new XMPPConnection(getServiceName());
-            conn4.login(getUsername(1), getUsername(1), "Home");
+        // Create another connection for the same user of connection 1
+        XMPPConnection conn4 = new XMPPConnection(getServiceName());
+        conn4.login(getUsername(1), getUsername(1), "Home");
 
-            // Add a new roster entry
-            Roster roster = getConnection(0).getRoster();
-            roster.createEntry(getBareJID(1), "gato11", null);
-
-            // Wait up to 2 seconds
-            long initial = System.currentTimeMillis();
-            while (System.currentTimeMillis() - initial < 2000 &&
-                    (roster.getPresence(getBareJID(1)) == null)) {
-                Thread.sleep(100);
-            }
-
-            // Check that a presence is returned for a user
-            presence = roster.getPresence(getBareJID(1));
-            assertNotNull("Returned a null Presence for an existing user", presence);
-
-            // Check that the right presence is returned for a user+resource
-            presence = roster.getPresenceResource(getUsername(1) + "@" + conn4.getServiceName() + "/Home");
-            assertEquals(
-                "Returned the wrong Presence",
-                StringUtils.parseResource(presence.getFrom()),
-                "Home");
-
-            // Check that the right presence is returned for a user+resource
-            presence = roster.getPresenceResource(getFullJID(1));
-            assertEquals(
-                "Returned the wrong Presence",
-                StringUtils.parseResource(presence.getFrom()),
-                "Smack");
-
-            // Check that the no presence is returned for a non-existent user+resource
-            presence = roster.getPresenceResource("noname@" + getServiceName() + "/Smack");
-            assertNull("Returned a Presence for a non-existing user", presence);
-
-            // Check that the returned presences are correct
-            Iterator presences = roster.getPresences(getBareJID(1));
-            int count = 0;
-            while (presences.hasNext()) {
-                count++;
-                presences.next();
-            }
-            assertEquals("Wrong number of returned presences", count, 2);
-
-            // Close the connection so one presence must go            
-            conn4.close();
-
-            // Check that the returned presences are correct
-            presences = roster.getPresences(getBareJID(1));
-            count = 0;
-            while (presences.hasNext()) {
-                count++;
-                presences.next();
-            }
-            assertEquals("Wrong number of returned presences", count, 1);
-
-            Thread.sleep(200);
-            cleanUpRoster();
+        // Add a new roster entry
+        Roster roster = getConnection(0).getRoster();
+        roster.createEntry(getBareJID(1), "gato11", null);
 
+        // Wait up to 2 seconds
+        long initial = System.currentTimeMillis();
+        while (System.currentTimeMillis() - initial < 2000 &&
+                (roster.getPresence(getBareJID(1)) == null)) {
+            Thread.sleep(100);
         }
-        catch (Exception e) {
-            fail(e.getMessage());
+
+        // Check that a presence is returned for a user
+        presence = roster.getPresence(getBareJID(1));
+        assertNotNull("Returned a null Presence for an existing user", presence);
+
+        // Check that the right presence is returned for a user+resource
+        presence = roster.getPresenceResource(getUsername(1) + "@" + conn4.getServiceName() + "/Home");
+        assertEquals(
+            "Returned the wrong Presence",
+            StringUtils.parseResource(presence.getFrom()),
+            "Home");
+
+        // Check that the right presence is returned for a user+resource
+        presence = roster.getPresenceResource(getFullJID(1));
+        assertEquals(
+            "Returned the wrong Presence",
+            StringUtils.parseResource(presence.getFrom()),
+            "Smack");
+
+        // Check that the no presence is returned for a non-existent user+resource
+        presence = roster.getPresenceResource("noname@" + getServiceName() + "/Smack");
+        assertNull("Returned a Presence for a non-existing user", presence);
+
+        // Check that the returned presences are correct
+        Iterator presences = roster.getPresences(getBareJID(1));
+        int count = 0;
+        while (presences.hasNext()) {
+            count++;
+            presences.next();
         }
+        assertEquals("Wrong number of returned presences", count, 2);
+
+        // Close the connection so one presence must go
+        conn4.close();
+
+        // Check that the returned presences are correct
+        presences = roster.getPresences(getBareJID(1));
+        count = 0;
+        while (presences.hasNext()) {
+            count++;
+            presences.next();
+        }
+        assertEquals("Wrong number of returned presences", count, 1);
+
+        Thread.sleep(200);
+        cleanUpRoster();
     }
 
     /**
@@ -586,34 +607,17 @@ public class RosterTest extends SmackTestCase {
                 fail(e.getMessage());
             }
         }
-        // Wait up to 2 seconds to receive roster removal notifications
+        // Wait up to 6 seconds to receive roster removal notifications
         long initial = System.currentTimeMillis();
-        while (System.currentTimeMillis() - initial < 2000 &&
-                getConnection(0).getRoster().getEntryCount() != 0) {
+        while (System.currentTimeMillis() - initial < 6000 && (
+                getConnection(0).getRoster().getEntryCount() != 0 ||
+                        getConnection(1).getRoster().getEntryCount() != 0 ||
+                        getConnection(2).getRoster().getEntryCount() != 0)) {
             try {
                 Thread.sleep(100);
             } catch (InterruptedException e) {}
         }
 
-        // Wait up to 2 seconds to receive roster removal notifications
-        initial = System.currentTimeMillis();
-        while (System.currentTimeMillis() - initial < 2000 &&
-                getConnection(1).getRoster().getEntryCount() != 0) {
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException e) {}
-        }
-
-        // Wait up to 2 seconds to receive roster removal notifications
-        initial = System.currentTimeMillis();
-        while (System.currentTimeMillis() - initial < 2000 &&
-                getConnection(2).getRoster().getEntryCount() != 0) {
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException e) {}
-        }
-
-
         assertEquals(
             "Wrong number of entries in connection 0",
             0,
diff --git a/test/org/jivesoftware/smackx/muc/MultiUserChatCreationTest.java b/test/org/jivesoftware/smackx/muc/MultiUserChatCreationTest.java
index 7aa341fc3..589c477f5 100644
--- a/test/org/jivesoftware/smackx/muc/MultiUserChatCreationTest.java
+++ b/test/org/jivesoftware/smackx/muc/MultiUserChatCreationTest.java
@@ -51,11 +51,14 @@
  */
 package org.jivesoftware.smackx.muc;
 
-import java.util.*;
-
-import org.jivesoftware.smack.*;
+import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.test.SmackTestCase;
-import org.jivesoftware.smackx.*;
+import org.jivesoftware.smackx.Form;
+import org.jivesoftware.smackx.FormField;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * Tests creating new MUC rooms.
@@ -90,15 +93,15 @@ public class MultiUserChatCreationTest extends SmackTestCase {
             // Create a new form to submit based on the original form
             Form submitForm = form.createAnswerForm();
             // Add default answers to the form to submit
-            for (Iterator fields = form.getFields(); fields.hasNext();) {
-                FormField field = (FormField) fields.next();
+            for (Iterator<FormField> fields = form.getFields(); fields.hasNext();) {
+                FormField field = fields.next();
                 if (!FormField.TYPE_HIDDEN.equals(field.getType())
                     && field.getVariable() != null) {
                     // Sets the default value as the answer
                     submitForm.setDefaultAnswer(field.getVariable());
                 }
             }
-            List owners = new ArrayList();
+            List<String> owners = new ArrayList<String>();
             owners.add(getBareJID(0));
             submitForm.setAnswer("muc#roomconfig_roomowners", owners);