diff --git a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
index 4b8cba52f..c3f4f54fe 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
@@ -341,7 +341,7 @@ public abstract class ConnectionConfiguration {
      * An enumeration for TLS security modes that are available when making a connection
      * to the XMPP server.
      */
-    public static enum SecurityMode {
+    public enum SecurityMode {
 
         /**
          * Security via TLS encryption is required in order to connect. If the server
@@ -492,7 +492,7 @@ public abstract class ConnectionConfiguration {
      * <p>
      * This is an abstract class that uses the builder design pattern and the "getThis() trick" to recover the type of
      * the builder in a class hierarchies with a self-referential generic supertype. Otherwise chaining of build
-     * instructions from the superclasses followed by build instructions of a sublcass would not be possible, because
+     * instructions from the superclasses followed by build instructions of a subclass would not be possible, because
      * the superclass build instructions would return the builder of the superclass and not the one of the subclass. You
      * can read more about it a Angelika Langer's Generics FAQ, especially the entry <a
      * href="http://www.angelikalanger.com/GenericsFAQ/FAQSections/ProgrammingIdioms.html#FAQ206">What is the
@@ -646,7 +646,7 @@ public abstract class ConnectionConfiguration {
         public B setPort(int port) {
             if (port < 0 || port > 65535) {
                 throw new IllegalArgumentException(
-                        "Port must be a 16-bit unsiged integer (i.e. between 0-65535. Port was: " + port);
+                        "Port must be a 16-bit unsigned integer (i.e. between 0-65535. Port was: " + port);
             }
             this.port = port;
             return getThis();
@@ -930,7 +930,7 @@ public abstract class ConnectionConfiguration {
             Set<String> blacklistedMechanisms = SASLAuthentication.getBlacklistedSASLMechanisms();
             for (String mechanism : saslMechanisms) {
                 if (!SASLAuthentication.isSaslMechanismRegistered(mechanism)) {
-                    throw new IllegalArgumentException("SASL " + mechanism + " is not avaiable. Consider registering it with Smack");
+                    throw new IllegalArgumentException("SASL " + mechanism + " is not available. Consider registering it with Smack");
                 }
                 if (blacklistedMechanisms.contains(mechanism)) {
                     throw new IllegalArgumentException("SALS " + mechanism + " is blacklisted.");
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionCreationListener.java b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionCreationListener.java
index 5b724078f..f798b803a 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionCreationListener.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionCreationListener.java
@@ -33,6 +33,6 @@ public interface ConnectionCreationListener {
      * 
      * @param connection the newly created connection.
      */
-    public void connectionCreated(XMPPConnection connection);
+    void connectionCreated(XMPPConnection connection);
 
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionListener.java b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionListener.java
index 5a677df31..c096e48b2 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionListener.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionListener.java
@@ -37,7 +37,7 @@ public interface ConnectionListener {
      *
      * @param connection the XMPPConnection which successfully connected to its endpoint.
      */
-    public void connected(XMPPConnection connection);
+    void connected(XMPPConnection connection);
 
     /**
      * Notification that the connection has been authenticated.
@@ -45,12 +45,12 @@ public interface ConnectionListener {
      * @param connection the XMPPConnection which successfully authenticated.
      * @param resumed true if a previous XMPP session's stream was resumed.
      */
-    public void authenticated(XMPPConnection connection, boolean resumed);
+    void authenticated(XMPPConnection connection, boolean resumed);
 
     /**
      * Notification that the connection was closed normally.
      */
-    public void connectionClosed();
+    void connectionClosed();
 
     /**
      * Notification that the connection was closed due to an exception. When
@@ -59,7 +59,7 @@ public interface ConnectionListener {
      *
      * @param e the exception.
      */
-    public void connectionClosedOnError(Exception e);
+    void connectionClosedOnError(Exception e);
 
     /**
      * The connection has reconnected successfully to the server. Connections will
@@ -68,7 +68,7 @@ public interface ConnectionListener {
      */
     // TODO: Remove in Smack 4.3
     @Deprecated
-    public void reconnectionSuccessful();
+    void reconnectionSuccessful();
 
     // The next two methods *must* only be invoked by ReconnectionManager
 
@@ -83,7 +83,7 @@ public interface ConnectionListener {
      */
     // TODO: Remove in Smack 4.3
     @Deprecated
-    public void reconnectingIn(int seconds);
+    void reconnectingIn(int seconds);
 
     /**
      * An attempt to connect to the server has failed. The connection will keep trying reconnecting to the server in a
@@ -97,5 +97,5 @@ public interface ConnectionListener {
      */
     // TODO: Remove in Smack 4.3
     @Deprecated
-    public void reconnectionFailed(Exception e);
+    void reconnectionFailed(Exception e);
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/ExceptionCallback.java b/smack-core/src/main/java/org/jivesoftware/smack/ExceptionCallback.java
index cc1b98bdb..0a700e30e 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/ExceptionCallback.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/ExceptionCallback.java
@@ -18,6 +18,6 @@ package org.jivesoftware.smack;
 
 public interface ExceptionCallback {
 
-    public void processException(Exception exception);
+    void processException(Exception exception);
 
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/Manager.java b/smack-core/src/main/java/org/jivesoftware/smack/Manager.java
index 47f5e0ade..0b7924eb3 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/Manager.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/Manager.java
@@ -28,7 +28,7 @@ public abstract class Manager {
     public Manager(XMPPConnection connection) {
         Objects.requireNonNull(connection, "XMPPConnection must not be null");
 
-        weakConnection = new WeakReference<XMPPConnection>(connection);
+        weakConnection = new WeakReference<>(connection);
     }
 
     protected final XMPPConnection connection() {
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/ReconnectionListener.java b/smack-core/src/main/java/org/jivesoftware/smack/ReconnectionListener.java
index c404008ca..87eee0435 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/ReconnectionListener.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/ReconnectionListener.java
@@ -34,7 +34,7 @@ public interface ReconnectionListener {
      *
      * @param seconds remaining seconds before attempting a reconnection.
      */
-    public void reconnectingIn(int seconds);
+    void reconnectingIn(int seconds);
 
     /**
      * An attempt to connect to the server has failed. The connection will keep trying reconnecting to the server in a
@@ -46,5 +46,5 @@ public interface ReconnectionListener {
      *
      * @param e the exception that caused the reconnection to fail.
      */
-    public void reconnectionFailed(Exception e);
+    void reconnectionFailed(Exception e);
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/ReconnectionManager.java b/smack-core/src/main/java/org/jivesoftware/smack/ReconnectionManager.java
index 18cbcc1dc..0f7d65dec 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/ReconnectionManager.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/ReconnectionManager.java
@@ -189,7 +189,7 @@ public final class ReconnectionManager {
     private Thread reconnectionThread;
 
     private ReconnectionManager(AbstractXMPPConnection connection) {
-        weakRefConnection = new WeakReference<AbstractXMPPConnection>(connection);
+        weakRefConnection = new WeakReference<>(connection);
 
         reconnectionRunnable = new Runnable() {
 
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java b/smack-core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java
index 8c4cfe88f..8e8418b23 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java
@@ -64,9 +64,9 @@ public final class SASLAuthentication {
 
     private static final Logger LOGGER = Logger.getLogger(SASLAuthentication.class.getName());
 
-    private static final List<SASLMechanism> REGISTERED_MECHANISMS = new ArrayList<SASLMechanism>();
+    private static final List<SASLMechanism> REGISTERED_MECHANISMS = new ArrayList<>();
 
-    private static final Set<String> BLACKLISTED_MECHANISMS = new HashSet<String>();
+    private static final Set<String> BLACKLISTED_MECHANISMS = new HashSet<>();
 
     static {
         // Blacklist SCRAM-SHA-1-PLUS for now.
@@ -91,7 +91,7 @@ public final class SASLAuthentication {
      * @return the registered SASLMechanism sorted by the level of preference.
      */
     public static Map<String, String> getRegisterdSASLMechanisms() {
-        Map<String, String> answer = new LinkedHashMap<String, String>();
+        Map<String, String> answer = new LinkedHashMap<>();
         synchronized (REGISTERED_MECHANISMS) {
             for (SASLMechanism mechanism : REGISTERED_MECHANISMS) {
                 answer.put(mechanism.getClass().getName(), mechanism.toString());
@@ -132,9 +132,9 @@ public final class SASLAuthentication {
         return false;
     }
 
-    public static boolean blacklistSASLMechanism(String mechansim) {
+    public static boolean blacklistSASLMechanism(String mechanism) {
         synchronized (BLACKLISTED_MECHANISMS) {
-            return BLACKLISTED_MECHANISMS.add(mechansim);
+            return BLACKLISTED_MECHANISMS.add(mechanism);
         }
     }
 
@@ -356,8 +356,8 @@ public final class SASLAuthentication {
             throw new SmackException(
                             "No supported and enabled SASL Mechanism provided by server. " +
                             "Server announced mechanisms: " + serverMechanisms + ". " +
-                            "Registerd SASL mechanisms with Smack: " + REGISTERED_MECHANISMS + ". " +
-                            "Enabled SASL mechansisms for this connection: " + configuration.getEnabledSaslMechanisms() + ". " +
+                            "Registered SASL mechanisms with Smack: " + REGISTERED_MECHANISMS + ". " +
+                            "Enabled SASL mechanisms for this connection: " + configuration.getEnabledSaslMechanisms() + ". " +
                             "Blacklisted SASL mechanisms: " + BLACKLISTED_MECHANISMS + '.'
                             );
             // @formatter;on
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java b/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java
index 71ec63ec5..7c4f8fd5f 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java
@@ -55,11 +55,11 @@ public final class SmackConfiguration {
     private static int defaultPacketReplyTimeout = 5000;
     private static int packetCollectorSize = 5000;
 
-    private static List<String> defaultMechs = new ArrayList<String>();
+    private static List<String> defaultMechs = new ArrayList<>();
 
-    static Set<String> disabledSmackClasses = new HashSet<String>();
+    static Set<String> disabledSmackClasses = new HashSet<>();
 
-    final static List<XMPPInputOutputStream> compressionHandlers = new ArrayList<XMPPInputOutputStream>(2);
+    final static List<XMPPInputOutputStream> compressionHandlers = new ArrayList<>(2);
 
     static boolean smackInitialized = false;
 
@@ -67,7 +67,7 @@ public final class SmackConfiguration {
 
     /**
      * Value that indicates whether debugging is enabled. When enabled, a debug
-     * window will apear for each new connection that will contain the following
+     * window will appear for each new connection that will contain the following
      * information:<ul>
      * <li> Client Traffic -- raw XML traffic generated by Smack and sent to the server.
      * <li> Server Traffic -- raw XML traffic sent by the server to the client.
@@ -280,8 +280,8 @@ public final class SmackConfiguration {
         compressionHandlers.add(xmppInputOutputStream);
     }
 
-    public static List<XMPPInputOutputStream> getCompresionHandlers() {
-        List<XMPPInputOutputStream> res = new ArrayList<XMPPInputOutputStream>(compressionHandlers.size());
+    public static List<XMPPInputOutputStream> getCompressionHandlers() {
+        List<XMPPInputOutputStream> res = new ArrayList<>(compressionHandlers.size());
         for (XMPPInputOutputStream ios : compressionHandlers) {
             if (ios.isSupported()) {
                 res.add(ios);
@@ -293,7 +293,7 @@ public final class SmackConfiguration {
     /**
      * Set the default HostnameVerifier that will be used by XMPP connections to verify the hostname
      * of a TLS certificate. XMPP connections are able to overwrite this settings by supplying a
-     * HostnameVerifier in their ConnecitonConfiguration with
+     * HostnameVerifier in their ConnectionConfiguration with
      * {@link ConnectionConfiguration.Builder#setHostnameVerifier(HostnameVerifier)}.
      */
     public static void setDefaultHostnameVerifier(HostnameVerifier verifier) {
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java b/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java
index 988d2091d..9f83296bd 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java
@@ -258,7 +258,7 @@ public class SmackException extends Exception {
 
         public ConnectionException(Throwable wrappedThrowable) {
             super(wrappedThrowable);
-            failedAddresses = new ArrayList<HostAddress>(0);
+            failedAddresses = new ArrayList<>(0);
         }
 
         private ConnectionException(String message, List<HostAddress> failedAddresses) {
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SmackInitialization.java b/smack-core/src/main/java/org/jivesoftware/smack/SmackInitialization.java
index 3573e9f48..3a8684cbe 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/SmackInitialization.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/SmackInitialization.java
@@ -40,7 +40,6 @@ import org.jivesoftware.smack.util.FileUtils;
 import org.jivesoftware.smack.util.StringUtils;
 
 import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlPullParserFactory;
 
 
@@ -71,7 +70,7 @@ public final class SmackInitialization {
             }
         } catch (Exception e) {
             LOGGER.log(Level.SEVERE, "Could not determine Smack version", e);
-            smackVersion = "unkown";
+            smackVersion = "unknown";
         }
         SMACK_VERSION = smackVersion;
 
@@ -182,7 +181,7 @@ public final class SmackInitialization {
 
     private static void parseClassesToLoad(XmlPullParser parser, boolean optional,
                     Collection<Exception> exceptions, ClassLoader classLoader)
-                    throws XmlPullParserException, IOException, Exception {
+                    throws Exception {
         final String startName = parser.getName();
         int eventType;
         String name;
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java b/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java
index b5f325a09..07b897f48 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java
@@ -288,7 +288,7 @@ public class StanzaCollector {
         }
     }
 
-    private final void throwIfCancelled() {
+    private void throwIfCancelled() {
         if (cancelled) {
             throw new IllegalStateException("Packet collector already cancelled");
         }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java b/smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java
index c5e5eb1aa..0e81d7906 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java
@@ -52,6 +52,6 @@ public interface StanzaListener {
      * @throws InterruptedException 
      * @throws NotLoggedInException 
      */
-    public void processStanza(Stanza packet) throws NotConnectedException, InterruptedException, NotLoggedInException;
+    void processStanza(Stanza packet) throws NotConnectedException, InterruptedException, NotLoggedInException;
 
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SuccessCallback.java b/smack-core/src/main/java/org/jivesoftware/smack/SuccessCallback.java
index 49106a9f1..ce5dd8470 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/SuccessCallback.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/SuccessCallback.java
@@ -18,6 +18,6 @@ package org.jivesoftware.smack;
 
 public interface SuccessCallback<T> {
 
-    public void onSuccess(T result);
+    void onSuccess(T result);
 
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnectionRegistry.java b/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnectionRegistry.java
index a45838c40..99264e568 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnectionRegistry.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnectionRegistry.java
@@ -27,7 +27,7 @@ public class XMPPConnectionRegistry {
      * A set of listeners which will be invoked if a new connection is created.
      */
     private final static Set<ConnectionCreationListener> connectionEstablishedListeners =
-            new CopyOnWriteArraySet<ConnectionCreationListener>();
+            new CopyOnWriteArraySet<>();
 
     /**
      * Adds a new listener that will be notified when new Connections are created. Note
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/EmptyToMatcher.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/EmptyToMatcher.java
index ff3b5d72a..3a3e8e387 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/filter/EmptyToMatcher.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/EmptyToMatcher.java
@@ -30,10 +30,7 @@ public final class EmptyToMatcher implements StanzaFilter {
     @Override
     public boolean accept(Stanza packet) {
         Jid packetTo = packet.getTo();
-        if (packetTo == null) {
-            return true;
-        }
-        return false;
+        return packetTo == null;
     }
 
     @Override
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaFilter.java
index 83a3b127a..92fe0229c 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaFilter.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaFilter.java
@@ -54,5 +54,5 @@ public interface StanzaFilter {
      * @param stanza the stanza(/packet) to test.
      * @return true if and only if <tt>stanza</tt> passes the filter.
      */
-    public boolean accept(Stanza stanza);
+    boolean accept(Stanza stanza);
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/initializer/SmackInitializer.java b/smack-core/src/main/java/org/jivesoftware/smack/initializer/SmackInitializer.java
index 6c5c1fc4d..f219563ee 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/initializer/SmackInitializer.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/initializer/SmackInitializer.java
@@ -30,5 +30,5 @@ import org.jivesoftware.smack.SmackConfiguration;
  *
  */
 public interface SmackInitializer {
-    public List<Exception> initialize();
+    List<Exception> initialize();
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/iqrequest/IQRequestHandler.java b/smack-core/src/main/java/org/jivesoftware/smack/iqrequest/IQRequestHandler.java
index 59391cf98..9e3d9729c 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/iqrequest/IQRequestHandler.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/iqrequest/IQRequestHandler.java
@@ -26,7 +26,7 @@ import org.jivesoftware.smack.packet.IQ;
  */
 public interface IQRequestHandler {
 
-    public enum Mode {
+    enum Mode {
         /**
          * Process requests synchronously, i.e. in the order they arrive. Uses a single thread, which means that the other
          * requests have to wait until all previous synchronous requests have been handled. Use {@link #async} if
@@ -41,13 +41,13 @@ public interface IQRequestHandler {
         async,
     }
 
-    public IQ handleIQRequest(IQ iqRequest);
+    IQ handleIQRequest(IQ iqRequest);
 
-    public Mode getMode();
+    Mode getMode();
 
-    public IQ.Type getType();
+    IQ.Type getType();
 
-    public String getElement();
+    String getElement();
 
-    public String getNamespace();
+    String getNamespace();
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Element.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Element.java
index 19afa01c8..9bdb6194a 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Element.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Element.java
@@ -28,5 +28,5 @@ public interface Element {
      *
      * @return the stanza(/packet) extension as XML.
      */
-    public CharSequence toXML();
+    CharSequence toXML();
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/EmptyResultIQ.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/EmptyResultIQ.java
index fcd268a19..c4b16f3ea 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/EmptyResultIQ.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/EmptyResultIQ.java
@@ -25,7 +25,7 @@ public class EmptyResultIQ extends IQ {
 
     public EmptyResultIQ(IQ request) {
         this();
-        initialzeAsResultFor(request);
+        initializeAsResultFor(request);
     }
 
     @Override
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/ExtensionElement.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/ExtensionElement.java
index bfecd3f65..783eb5b7d 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/ExtensionElement.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/ExtensionElement.java
@@ -40,6 +40,6 @@ public interface ExtensionElement extends NamedElement {
      *
      * @return the namespace.
      */
-    public String getNamespace();
+    String getNamespace();
 
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java
index 700fef0bc..87217346d 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java
@@ -215,7 +215,7 @@ public abstract class IQ extends Stanza {
      */
     protected abstract IQChildElementXmlStringBuilder getIQChildElementBuilder(IQChildElementXmlStringBuilder xml);
 
-    protected final void initialzeAsResultFor(IQ request) {
+    protected final void initializeAsResultFor(IQ request) {
         if (!(request.getType() == Type.get || request.getType() == Type.set)) {
             throw new IllegalArgumentException(
                     "IQ must be of type 'set' or 'get'. Original IQ: " + request.toXML());
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/NamedElement.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/NamedElement.java
index bc22e1c25..53d735d14 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/NamedElement.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/NamedElement.java
@@ -28,6 +28,6 @@ public interface NamedElement extends Element {
      *
      * @return the element name.
      */
-    public String getElementName();
+    String getElementName();
 
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java
index d7126089a..bd1c93dc5 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java
@@ -28,15 +28,15 @@ import java.util.Set;
 @Deprecated
 public interface Packet extends TopLevelStreamElement {
 
-    public static final String TEXT = "text";
-    public static final String ITEM = "item";
+    String TEXT = "text";
+    String ITEM = "item";
 
     /**
      * Returns the unique ID of the stanza. The returned value could be <code>null</code>.
      *
      * @return the packet's unique ID or <code>null</code> if the id is not available.
      */
-    public String getStanzaId();
+    String getStanzaId();
 
     /**
      * Get the stanza id.
@@ -44,7 +44,7 @@ public interface Packet extends TopLevelStreamElement {
      * @deprecated use {@link #getStanzaId()} instead.
      */
     @Deprecated
-    public String getPacketID();
+    String getPacketID();
 
     /**
      * Sets the unique ID of the packet. To indicate that a stanza(/packet) has no id
@@ -52,7 +52,7 @@ public interface Packet extends TopLevelStreamElement {
      *
      * @param id the unique ID for the packet.
      */
-    public void setStanzaId(String id);
+    void setStanzaId(String id);
 
     /**
      * Set the stanza ID.
@@ -60,7 +60,7 @@ public interface Packet extends TopLevelStreamElement {
      * @deprecated use {@link #setStanzaId(String)} instead.
      */
     @Deprecated
-    public void setPacketID(String packetID);
+    void setPacketID(String packetID);
 
     /**
      * Returns who the stanza(/packet) is being sent "to", or <tt>null</tt> if
@@ -70,7 +70,7 @@ public interface Packet extends TopLevelStreamElement {
      * @return who the stanza(/packet) is being sent to, or <tt>null</tt> if the
      *      value has not been set.
      */
-    public String getTo();
+    String getTo();
 
     /**
      * Sets who the stanza(/packet) is being sent "to". The XMPP protocol often makes
@@ -78,7 +78,7 @@ public interface Packet extends TopLevelStreamElement {
      *
      * @param to who the stanza(/packet) is being sent to.
      */
-    public void setTo(String to);
+    void setTo(String to);
 
     /**
      * Returns who the stanza(/packet) is being sent "from" or <tt>null</tt> if
@@ -88,7 +88,7 @@ public interface Packet extends TopLevelStreamElement {
      * @return who the stanza(/packet) is being sent from, or <tt>null</tt> if the
      *      value has not been set.
      */
-    public String getFrom();
+    String getFrom();
 
     /**
      * Sets who the stanza(/packet) is being sent "from". The XMPP protocol often
@@ -97,7 +97,7 @@ public interface Packet extends TopLevelStreamElement {
      *
      * @param from who the stanza(/packet) is being sent to.
      */
-    public void setFrom(String from);
+    void setFrom(String from);
 
     /**
      * Returns the error associated with this packet, or <tt>null</tt> if there are
@@ -105,34 +105,34 @@ public interface Packet extends TopLevelStreamElement {
      *
      * @return the error sub-packet or <tt>null</tt> if there isn't an error.
      */
-    public XMPPError getError();
+    XMPPError getError();
     /**
      * Sets the error for this packet.
      *
      * @param error the error to associate with this packet.
      */
-    public void setError(XMPPError error);
+    void setError(XMPPError error);
 
     /**
      * Returns the xml:lang of this Stanza, or null if one has not been set.
      *
      * @return the xml:lang of this Stanza, or null.
      */
-    public String getLanguage();
+    String getLanguage();
 
     /**
      * Sets the xml:lang of this Stanza.
      *
      * @param language the xml:lang of this Stanza.
      */
-    public void setLanguage(String language);
+    void setLanguage(String language);
 
     /**
      * Returns a copy of the stanza(/packet) extensions attached to the packet.
      *
      * @return the stanza(/packet) extensions.
      */
-    public List<ExtensionElement> getExtensions();
+    List<ExtensionElement> getExtensions();
 
     /**
      * Return a set of all extensions with the given element name <emph>and</emph> namespace.
@@ -145,7 +145,7 @@ public interface Packet extends TopLevelStreamElement {
      * @return a set of all matching extensions.
      * @since 4.1
      */
-    public Set<ExtensionElement> getExtensions(String elementName, String namespace);
+    Set<ExtensionElement> getExtensions(String elementName, String namespace);
 
     /**
      * Returns the first extension of this stanza(/packet) that has the given namespace.
@@ -156,7 +156,7 @@ public interface Packet extends TopLevelStreamElement {
      * @param namespace the namespace of the extension that is desired.
      * @return the stanza(/packet) extension with the given namespace.
      */
-    public ExtensionElement getExtension(String namespace);
+    ExtensionElement getExtension(String namespace);
 
     /**
      * Returns the first stanza(/packet) extension that matches the specified element name and
@@ -173,20 +173,20 @@ public interface Packet extends TopLevelStreamElement {
      * @param namespace the XML element namespace of the stanza(/packet) extension.
      * @return the extension, or <tt>null</tt> if it doesn't exist.
      */
-    public <PE extends ExtensionElement> PE getExtension(String elementName, String namespace);
+    <PE extends ExtensionElement> PE getExtension(String elementName, String namespace);
     /**
      * Adds a stanza(/packet) extension to the packet. Does nothing if extension is null.
      *
      * @param extension a stanza(/packet) extension.
      */
-    public void addExtension(ExtensionElement extension);
+    void addExtension(ExtensionElement extension);
 
     /**
      * Adds a collection of stanza(/packet) extensions to the packet. Does nothing if extensions is null.
      * 
      * @param extensions a collection of stanza(/packet) extensions
      */
-    public void addExtensions(Collection<ExtensionElement> extensions);
+    void addExtensions(Collection<ExtensionElement> extensions);
 
     /**
      * Check if a stanza(/packet) extension with the given element and namespace exists.
@@ -198,7 +198,7 @@ public interface Packet extends TopLevelStreamElement {
      * @param namespace
      * @return true if a stanza(/packet) extension exists, false otherwise.
      */
-    public boolean hasExtension(String elementName, String namespace);
+    boolean hasExtension(String elementName, String namespace);
 
     /**
      * Check if a stanza(/packet) extension with the given namespace exists.
@@ -206,7 +206,7 @@ public interface Packet extends TopLevelStreamElement {
      * @param namespace
      * @return true if a stanza(/packet) extension exists, false otherwise.
      */
-    public boolean hasExtension(String namespace);
+    boolean hasExtension(String namespace);
 
     /**
      * Remove the stanza(/packet) extension with the given elementName and namespace.
@@ -215,7 +215,7 @@ public interface Packet extends TopLevelStreamElement {
      * @param namespace
      * @return the removed stanza(/packet) extension or null.
      */
-    public ExtensionElement removeExtension(String elementName, String namespace);
+    ExtensionElement removeExtension(String elementName, String namespace);
 
     /**
      * Removes a stanza(/packet) extension from the packet.
@@ -223,10 +223,10 @@ public interface Packet extends TopLevelStreamElement {
      * @param extension the stanza(/packet) extension to remove.
      * @return the removed stanza(/packet) extension or null.
      */
-    public ExtensionElement removeExtension(ExtensionElement extension);
+    ExtensionElement removeExtension(ExtensionElement extension);
 
     @Override
     // NOTE When Smack is using Java 8, then this method should be moved in Element as "Default Method".
-    public String toString();
+    String toString();
 
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/StreamError.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/StreamError.java
index b37fa3917..5ec0c3453 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/StreamError.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/StreamError.java
@@ -25,7 +25,7 @@ import org.jivesoftware.smack.util.XmlStringBuilder;
 
 /**
  * Represents a stream error packet. Stream errors are unrecoverable errors where the server
- * will close the unrelying TCP connection after the stream error was sent to the client.
+ * will close the underlying TCP connection after the stream error was sent to the client.
  * These is the list of stream errors as defined in the XMPP spec:<p>
  *
  * <table border=1>
@@ -174,7 +174,7 @@ public class StreamError extends AbstractError implements Nonza {
         restricted_xml,
         see_other_host,
         system_shutdown,
-        undeficed_condition,
+        undefined_condition,
         unsupported_encoding,
         unsupported_feature,
         unsupported_stanza_type,
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/parsing/ParsingExceptionCallback.java b/smack-core/src/main/java/org/jivesoftware/smack/parsing/ParsingExceptionCallback.java
index 232a61ec6..87721a571 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/parsing/ParsingExceptionCallback.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/parsing/ParsingExceptionCallback.java
@@ -39,6 +39,6 @@ public interface ParsingExceptionCallback {
      * @param stanzaData the raw stanza data that caused the exception
      * @throws Exception
      */
-    public void handleUnparsableStanza(UnparseableStanza stanzaData) throws Exception;
+    void handleUnparsableStanza(UnparseableStanza stanzaData) throws Exception;
 
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderManager.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderManager.java
index de5f2e28c..7784e4523 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderManager.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderManager.java
@@ -45,7 +45,7 @@ import org.jxmpp.util.XmppStringUtils;
  *      <li>jabber:iq:register</ul>
  *
  * Because many more IQ types are part of XMPP and its extensions, a pluggable IQ parsing
- * mechanism is provided. IQ providers are registered programatically or by creating a
+ * mechanism is provided. IQ providers are registered programmatically or by creating a
  * providers file. The file is an XML
  * document that contains one or more iqProvider entries, as in the following example:
  *
@@ -100,7 +100,7 @@ import org.jxmpp.util.XmppStringUtils;
  * is found in a packet, parsing will be passed to the correct provider. Each provider
  * can either implement the PacketExtensionProvider interface or be a standard Java Bean. In
  * the former case, each extension provider is responsible for parsing the raw XML stream to
- * contruct an object. In the latter case, bean introspection is used to try to automatically
+ * construct an object. In the latter case, bean introspection is used to try to automatically
  * set the properties of th class using the values in the stanza(/packet) extension sub-element. When an
  * extension provider is not registered for an element name and namespace combination, Smack will
  * store all top-level elements of the sub-packet in DefaultPacketExtension object and then
@@ -207,7 +207,7 @@ public final class ProviderManager {
 
     /**
      * Removes an IQ provider with the specified element name and namespace. This
-     * method is typically called to cleanup providers that are programatically added
+     * method is typically called to cleanup providers that are programmatically added
      * using the {@link #addIQProvider(String, String, Object) addIQProvider} method.
      *
      * @param elementName the XML element name.
@@ -237,7 +237,7 @@ public final class ProviderManager {
      *
      * @param elementName element name associated with extension provider.
      * @param namespace namespace associated with extension provider.
-     * @return the extenion provider.
+     * @return the extension provider.
      */
     public static ExtensionElementProvider<ExtensionElement> getExtensionProvider(String elementName, String namespace) {
         String key = getKey(elementName, namespace);
@@ -269,7 +269,7 @@ public final class ProviderManager {
 
     /**
      * Removes an extension provider with the specified element name and namespace. This
-     * method is typically called to cleanup providers that are programatically added
+     * method is typically called to cleanup providers that are programmatically added
      * using the {@link #addExtensionProvider(String, String, Object) addExtensionProvider} method.
      *
      * @param elementName the XML element name.
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/proxy/HTTPProxySocketConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/proxy/HTTPProxySocketConnection.java
index 51df1a1a3..5c222f9b2 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/proxy/HTTPProxySocketConnection.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/proxy/HTTPProxySocketConnection.java
@@ -78,7 +78,7 @@ class HTTPProxySocketConnection implements ProxySocketConnection {
             got.append(c);
             if (got.length() > 1024)
             {
-                throw new ProxyException(ProxyInfo.ProxyType.HTTP, "Recieved " +
+                throw new ProxyException(ProxyInfo.ProxyType.HTTP, "Received " +
                     "header of >1024 characters from "
                     + proxyhost + ", cancelling connection");
             }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxyInfo.java b/smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxyInfo.java
index c0e9c25af..7b312e2d3 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxyInfo.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxyInfo.java
@@ -25,7 +25,7 @@ package org.jivesoftware.smack.proxy;
 
 public class ProxyInfo
 {
-    public static enum ProxyType
+    public enum ProxyType
     {
         HTTP,
         SOCKS4,
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxySocketConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxySocketConnection.java
index ededc4522..aad3cb5bf 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxySocketConnection.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxySocketConnection.java
@@ -21,7 +21,7 @@ import java.net.Socket;
 
 public interface ProxySocketConnection {
 
-    public void connect(Socket socket, String host, int port, int timeout)
+    void connect(Socket socket, String host, int port, int timeout)
                     throws IOException;
 
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketConnection.java
index b416319d0..a1fcd1b65 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketConnection.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketConnection.java
@@ -117,7 +117,7 @@ public class Socks4ProxySocketConnection implements ProxySocketConnection {
 
     90: request granted
     91: request rejected or failed
-    92: request rejected becasue SOCKS server cannot connect to
+    92: request rejected because SOCKS server cannot connect to
     identd on the client
     93: request rejected because the client program and identd
     report different user-ids
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramMechanism.java b/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramMechanism.java
index 65f033b18..8ee5ba1ba 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramMechanism.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramMechanism.java
@@ -246,7 +246,7 @@ public abstract class ScramMechanism extends SASLMechanism {
             return gs2Header;
         }
 
-        return ByteUtils.concact(gs2Header, cbindData);
+        return ByteUtils.concat(gs2Header, cbindData);
     }
 
     protected String getChannelBindingName() {
@@ -394,7 +394,7 @@ public abstract class ScramMechanism extends SASLMechanism {
             throw new AssertionError();
         }
         // U1 := HMAC(str, salt + INT(1))
-        byte[] u = hmac(key, ByteUtils.concact(salt, ONE));
+        byte[] u = hmac(key, ByteUtils.concat(salt, ONE));
         byte[] res = u.clone();
         for (int i = 1; i < iterations; i++) {
             u = hmac(key, u);
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/Async.java b/smack-core/src/main/java/org/jivesoftware/smack/util/Async.java
index 86b6dae09..ea80fd549 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/Async.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/Async.java
@@ -73,7 +73,7 @@ public class Async {
                 if (e instanceof RuntimeException) {
                     throw (RuntimeException) e;
                 }
-                LOGGER.log(Level.WARNING, "Catched Exception", e);
+                LOGGER.log(Level.WARNING, "Caught Exception", e);
             }
         }
 
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/ByteUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/ByteUtils.java
index 1e6b0ed99..6d52b4cf2 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/ByteUtils.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/ByteUtils.java
@@ -17,7 +17,7 @@
 package org.jivesoftware.smack.util;
 
 public class ByteUtils {
-    public static byte[] concact(byte[] arrayOne, byte[] arrayTwo) {
+    public static byte[] concat(byte[] arrayOne, byte[] arrayTwo) {
         int combinedLength = arrayOne.length + arrayTwo.length;
         byte[] res = new byte[combinedLength];
         System.arraycopy(arrayOne, 0, res, 0, arrayOne.length);
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/LazyStringBuilder.java b/smack-core/src/main/java/org/jivesoftware/smack/util/LazyStringBuilder.java
index 6baf74625..2ca66515a 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/LazyStringBuilder.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/LazyStringBuilder.java
@@ -35,7 +35,7 @@ public class LazyStringBuilder implements Appendable, CharSequence {
     }
 
     public LazyStringBuilder() {
-        list = new ArrayList<CharSequence>(20);
+        list = new ArrayList<>(20);
     }
 
     public LazyStringBuilder append(LazyStringBuilder lsb) {
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/ObservableWriter.java b/smack-core/src/main/java/org/jivesoftware/smack/util/ObservableWriter.java
index a92d00c28..b53c0f429 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/ObservableWriter.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/ObservableWriter.java
@@ -90,19 +90,17 @@ public class ObservableWriter extends Writer {
 
     /**
      * Notify that a new string has been written.
-     * 
-     * @param str the written String to notify 
      */
     private void notifyListeners() {
-        WriterListener[] writerListeners = null;
+        WriterListener[] writerListeners;
         synchronized (listeners) {
             writerListeners = new WriterListener[listeners.size()];
             listeners.toArray(writerListeners);
         }
         String str = stringBuilder.toString();
         stringBuilder.setLength(0);
-        for (int i = 0; i < writerListeners.length; i++) {
-            writerListeners[i].write(str);
+        for (WriterListener writerListener : writerListeners) {
+            writerListener.write(str);
         }
     }
 
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
index 4c02ee080..5c6267381 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
@@ -229,7 +229,7 @@ public class PacketParserUtils {
         String language = getLanguageAttribute(parser);
 
         // determine message's default language
-        String defaultLanguage = null;
+        String defaultLanguage;
         if (language != null && !"".equals(language.trim())) {
             message.setLanguage(language);
             defaultLanguage = language;
@@ -746,7 +746,7 @@ public class PacketParserUtils {
     public static Map<String, String> parseDescriptiveTexts(XmlPullParser parser, Map<String, String> descriptiveTexts)
                     throws XmlPullParserException, IOException {
         if (descriptiveTexts == null) {
-            descriptiveTexts = new HashMap<String, String>();
+            descriptiveTexts = new HashMap<>();
         }
         String xmllang = getLanguageAttribute(parser);
         if (xmllang == null) {
@@ -805,7 +805,7 @@ public class PacketParserUtils {
      */
     public static StreamError parseStreamError(XmlPullParser parser) throws Exception {
         final int initialDepth = parser.getDepth();
-        List<ExtensionElement> extensions = new ArrayList<ExtensionElement>();
+        List<ExtensionElement> extensions = new ArrayList<>();
         Map<String, String> descriptiveTexts = null;
         StreamError.Condition condition = null;
         String conditionText = null;
@@ -857,7 +857,7 @@ public class PacketParserUtils {
                     throws Exception {
         final int initialDepth = parser.getDepth();
         Map<String, String> descriptiveTexts = null;
-        List<ExtensionElement> extensions = new ArrayList<ExtensionElement>();
+        List<ExtensionElement> extensions = new ArrayList<>();
         XMPPError.Builder builder = XMPPError.getBuilder();
 
         // Parse the error header
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketUtil.java b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketUtil.java
index a94369792..138f6d32a 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketUtil.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketUtil.java
@@ -32,7 +32,7 @@ public class PacketUtil {
      * @deprecated use {@link #extensionElementFrom(Collection, String, String)} instead
      */
     @Deprecated
-    public static <PE extends ExtensionElement> PE packetExtensionfromCollection(
+    public static <PE extends ExtensionElement> PE packetExtensionFromCollection(
                     Collection<ExtensionElement> collection, String element,
                     String namespace) {
         return extensionElementFrom(collection, element, namespace);
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/ParserUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/ParserUtils.java
index 14a003a21..d42dc963a 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/ParserUtils.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/ParserUtils.java
@@ -138,11 +138,7 @@ public class ParserUtils {
         if (valueString == null)
             return null;
         valueString = valueString.toLowerCase(Locale.US);
-        if (valueString.equals("true") || valueString.equals("0")) {
-            return true;
-        } else {
-            return false;
-        }
+        return valueString.equals("true") || valueString.equals("0");
     }
 
     public static boolean getBooleanAttribute(XmlPullParser parser, String name,
@@ -232,8 +228,7 @@ public class ParserUtils {
 
     public static URI getUriFromNextText(XmlPullParser parser) throws XmlPullParserException, IOException, URISyntaxException  {
         String uriString = parser.nextText();
-        URI uri = new URI(uriString);
-        return uri;
+        return new URI(uriString);
     }
 
     public static String getRequiredAttribute(XmlPullParser parser, String name) throws IOException {
@@ -253,7 +248,6 @@ public class ParserUtils {
     }
 
     public static String getXmlLang(XmlPullParser parser) {
-        String langString = parser.getAttributeValue("http://www.w3.org/XML/1998/namespace", "lang");
-        return langString;
+        return parser.getAttributeValue("http://www.w3.org/XML/1998/namespace", "lang");
     }
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/ReaderListener.java b/smack-core/src/main/java/org/jivesoftware/smack/util/ReaderListener.java
index 9fc4d081e..b6c1ee802 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/ReaderListener.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/ReaderListener.java
@@ -33,6 +33,6 @@ public interface ReaderListener {
      * 
      * @param str the read String
      */
-    public abstract void read(String str);
+    void read(String str);
 
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/StringTransformer.java b/smack-core/src/main/java/org/jivesoftware/smack/util/StringTransformer.java
index 701ee2953..313dcf29e 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/StringTransformer.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/StringTransformer.java
@@ -18,6 +18,6 @@ package org.jivesoftware.smack.util;
 
 public interface StringTransformer {
 
-    public String transform(String string);
+    String transform(String string);
 
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java
index e9fc0871e..79b5f9c06 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java
@@ -444,10 +444,10 @@ public class StringUtils {
     }
 
     public static boolean nullSafeCharSequenceEquals(CharSequence csOne, CharSequence csTwo) {
-        return nullSafeCharSequenceComperator(csOne, csTwo) == 0;
+        return nullSafeCharSequenceComparator(csOne, csTwo) == 0;
     }
 
-    public static int nullSafeCharSequenceComperator(CharSequence csOne, CharSequence csTwo) {
+    public static int nullSafeCharSequenceComparator(CharSequence csOne, CharSequence csTwo) {
         if (csOne == null ^ csTwo == null) {
             return (csOne == null) ? -1 : 1;
         }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/TLSUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/TLSUtils.java
index 94a83c3b0..fb7a7745e 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/TLSUtils.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/TLSUtils.java
@@ -55,7 +55,7 @@ public class TLSUtils {
      * According to the <a
      * href="https://raw.githubusercontent.com/stpeter/manifesto/master/manifesto.txt">Encrypted
      * XMPP Manifesto</a>, TLSv1.2 shall be deployed, providing fallback support for SSLv3 and
-     * TLSv1.1. This method goes one step boyond and upgrades the handshake to use TLSv1 or better.
+     * TLSv1.1. This method goes one step beyond and upgrades the handshake to use TLSv1 or better.
      * This method requires the underlying OS to support all of TLSv1.2 , 1.1 and 1.0.
      * </p>
      * 
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/TypedCloneable.java b/smack-core/src/main/java/org/jivesoftware/smack/util/TypedCloneable.java
index 226b5e3d8..0a2121845 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/TypedCloneable.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/TypedCloneable.java
@@ -29,6 +29,6 @@ public interface TypedCloneable<T> extends Cloneable {
      *
      * @return a cloned version of this instance.
      */
-    public T clone();
+    T clone();
 
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/WriterListener.java b/smack-core/src/main/java/org/jivesoftware/smack/util/WriterListener.java
index 7e72acbab..1ef53d3bf 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/WriterListener.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/WriterListener.java
@@ -33,6 +33,6 @@ public interface WriterListener {
      * 
      * @param str the written string
      */
-    public abstract void write(String str);
+    void write(String str);
 
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java b/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
index e0b4a3847..987ea9424 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
@@ -81,7 +81,7 @@ public class XmlStringBuilder implements Appendable, CharSequence {
 
     /**
      * Add a new element to this builder, with the {@link java.util.Date} instance as its content,
-     * which will get formated with {@link XmppDateTime#formatXEP0082Date(Date)}.
+     * which will get formatted with {@link XmppDateTime#formatXEP0082Date(Date)}.
      *
      * @param name element name
      * @param content content of element
@@ -123,7 +123,7 @@ public class XmlStringBuilder implements Appendable, CharSequence {
 
     /**
      * Add a new element to this builder, with the {@link java.util.Date} instance as its content,
-     * which will get formated with {@link XmppDateTime#formatXEP0082Date(Date)}
+     * which will get formatted with {@link XmppDateTime#formatXEP0082Date(Date)}
      * if {@link java.util.Date} instance is not <code>null</code>.
      *
      * @param name element name
@@ -245,7 +245,7 @@ public class XmlStringBuilder implements Appendable, CharSequence {
 
     /**
      * Add a new attribute to this builder, with the {@link java.util.Date} instance as its value,
-     * which will get formated with {@link XmppDateTime#formatXEP0082Date(Date)}.
+     * which will get formatted with {@link XmppDateTime#formatXEP0082Date(Date)}.
      *
      * @param name name of attribute
      * @param value value of attribute
@@ -280,7 +280,7 @@ public class XmlStringBuilder implements Appendable, CharSequence {
 
     /**
      * Add a new attribute to this builder, with the {@link java.util.Date} instance as its value,
-     * which will get formated with {@link XmppDateTime#formatXEP0082Date(Date)}
+     * which will get formatted with {@link XmppDateTime#formatXEP0082Date(Date)}
      * if {@link java.util.Date} instance is not <code>null</code>.
      *
      * @param name attribute name
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java
index 66a6d018a..780518128 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java
@@ -43,7 +43,7 @@ public class HostAddress {
     public HostAddress(String fqdn, int port, List<InetAddress> inetAddresses) {
         if (port < 0 || port > 65535)
             throw new IllegalArgumentException(
-                    "Port must be a 16-bit unsiged integer (i.e. between 0-65535. Port was: " + port);
+                    "Port must be a 16-bit unsigned integer (i.e. between 0-65535. Port was: " + port);
         if (StringUtils.isNotEmpty(fqdn) && fqdn.charAt(fqdn.length() - 1) == '.') {
             this.fqdn = fqdn.substring(0, fqdn.length() - 1);
         }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/dns/SRVRecord.java b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/SRVRecord.java
index f63c94e49..75feb7bc5 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/dns/SRVRecord.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/SRVRecord.java
@@ -48,12 +48,12 @@ public class SRVRecord extends HostAddress implements Comparable<SRVRecord> {
         StringUtils.requireNotNullOrEmpty(fqdn, "The FQDN must not be null");
         if (weight < 0 || weight > 65535)
             throw new IllegalArgumentException(
-                    "DNS SRV records weight must be a 16-bit unsiged integer (i.e. between 0-65535. Weight was: "
+                    "DNS SRV records weight must be a 16-bit unsigned integer (i.e. between 0-65535. Weight was: "
                             + weight);
 
         if (priority < 0 || priority > 65535)
             throw new IllegalArgumentException(
-                    "DNS SRV records priority must be a 16-bit unsiged integer (i.e. between 0-65535. Priority was: "
+                    "DNS SRV records priority must be a 16-bit unsigned integer (i.e. between 0-65535. Priority was: "
                             + priority);
 
         this.priority = priority;
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java b/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java
index 585c84659..1ee1180a9 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java
@@ -105,7 +105,7 @@ public class StanzaCollectorTest
             @Override
             public void run()
             {
-                Stanza p = null;
+                Stanza p;
 
                 do
                 {
@@ -134,7 +134,7 @@ public class StanzaCollectorTest
             @Override
             public void run()
             {
-                Stanza p = null;
+                Stanza p;
 
                 do
                 {
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java b/smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java
index ba7806491..39101c2dd 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java
@@ -37,8 +37,8 @@ import org.jivesoftware.smack.packet.Stanza;
 public class ThreadedDummyConnection extends DummyConnection {
     private static final Logger LOGGER = Logger.getLogger(ThreadedDummyConnection.class.getName());
 
-    private BlockingQueue<IQ> replyQ = new ArrayBlockingQueue<IQ>(1);
-    private BlockingQueue<Stanza> messageQ = new LinkedBlockingQueue<Stanza>(5);
+    private final BlockingQueue<IQ> replyQ = new ArrayBlockingQueue<>(1);
+    private final BlockingQueue<Stanza> messageQ = new LinkedBlockingQueue<>(5);
     private volatile boolean timeout = false;
 
     @Override
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java b/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java
index 4c546c9c2..45d598240 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java
@@ -142,7 +142,7 @@ public class MessageTest {
         XmlUnitUtils.assertSimilar(control, message.toXML());
 
         Collection<String> languages = message.getBodyLanguages();
-        List<String> controlLanguages = new ArrayList<String>();
+        List<String> controlLanguages = new ArrayList<>();
         controlLanguages.add(lang2);
         controlLanguages.add(lang3);
         controlLanguages.removeAll(languages);
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java b/smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java
index d59404759..1b96306a6 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smack.parsing;
 
-import static org.jivesoftware.smack.test.util.CharsequenceEquals.equalsCharSequence;
+import static org.jivesoftware.smack.test.util.CharSequenceEquals.equalsCharSequence;
 import static org.junit.Assert.assertThat;
 
 import org.jivesoftware.smack.SmackException;
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/sasl/DigestMd5SaslTest.java b/smack-core/src/test/java/org/jivesoftware/smack/sasl/DigestMd5SaslTest.java
index 04a0cbf3a..8a3e047b5 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/sasl/DigestMd5SaslTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/sasl/DigestMd5SaslTest.java
@@ -24,7 +24,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.jivesoftware.smack.SmackException;
-import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.util.StringUtils;
 
 import org.jxmpp.jid.EntityBareJid;
@@ -40,7 +39,7 @@ public class DigestMd5SaslTest extends AbstractSaslTest {
         super(saslMechanism);
     }
 
-    protected void runTest(boolean useAuthzid) throws NotConnectedException, SmackException, InterruptedException, XmppStringprepException, UnsupportedEncodingException {
+    protected void runTest(boolean useAuthzid) throws SmackException, InterruptedException, XmppStringprepException, UnsupportedEncodingException {
         EntityBareJid authzid = null;
         if (useAuthzid) {
             authzid = JidCreate.entityBareFrom("shazbat@xmpp.org");
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/test/util/CharSequenceEquals.java b/smack-core/src/test/java/org/jivesoftware/smack/test/util/CharSequenceEquals.java
new file mode 100644
index 000000000..479ba39e7
--- /dev/null
+++ b/smack-core/src/test/java/org/jivesoftware/smack/test/util/CharSequenceEquals.java
@@ -0,0 +1,47 @@
+/**
+ *
+ * Copyright © 2014 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.test.util;
+
+import org.hamcrest.Description;
+import org.hamcrest.Factory;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+
+public class CharSequenceEquals extends TypeSafeMatcher<CharSequence> {
+
+    private final String charSequenceString;
+
+    public CharSequenceEquals(CharSequence charSequence) {
+        charSequenceString = charSequence.toString();
+    }
+
+    @Override
+    public void describeTo(Description description) {
+        description.appendText("Does not match CharSequence ").appendValue(charSequenceString);
+    }
+
+    @Override
+    protected boolean matchesSafely(CharSequence item) {
+        String itemString = item.toString();
+        return charSequenceString.equals(itemString);
+    }
+
+    @Factory
+    public static Matcher<CharSequence> equalsCharSequence(CharSequence charSequence) {
+        return new CharSequenceEquals(charSequence);
+    }
+}
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java b/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
index bdbeb4e1a..5674a1058 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
@@ -809,7 +809,7 @@ public class PacketParserUtilsTest {
                     IOException, TransformerException, SAXException {
         // @formatter:off
         final String stanza = XMLBuilder.create("outer", "outerNamespace").a("outerAttribute", "outerValue")
-                        .element("inner", "innerNamespace").a("innverAttribute", "innerValue")
+                        .element("inner", "innerNamespace").a("innerAttribute", "innerValue")
                             .element("innermost")
                                 .t("some text")
                         .asString();
diff --git a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java
index f246d1f51..879d8b5b4 100644
--- a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java
+++ b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java
@@ -240,7 +240,7 @@ public final class EnhancedDebuggerWindow {
         JPanel iqProvidersPanel = new JPanel();
         iqProvidersPanel.setLayout(new GridLayout(1, 1));
         iqProvidersPanel.setBorder(BorderFactory.createTitledBorder("Installed IQ Providers"));
-        Vector<String> providers = new Vector<String>();
+        Vector<String> providers = new Vector<>();
         for (Object provider : ProviderManager.getIQProviders()) {
             if (provider.getClass() == Class.class) {
                 providers.add(((Class<?>) provider).getName());
@@ -259,7 +259,7 @@ public final class EnhancedDebuggerWindow {
         JPanel extensionProvidersPanel = new JPanel();
         extensionProvidersPanel.setLayout(new GridLayout(1, 1));
         extensionProvidersPanel.setBorder(BorderFactory.createTitledBorder("Installed Extension Providers"));
-        providers = new Vector<String>();
+        providers = new Vector<>();
         for (Object provider : ProviderManager.getExtensionProviders()) {
             if (provider.getClass() == Class.class) {
                 providers.add(((Class<?>) provider).getName());
@@ -305,7 +305,7 @@ public final class EnhancedDebuggerWindow {
         menuItem.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                ArrayList<EnhancedDebugger> debuggersToRemove = new ArrayList<EnhancedDebugger>();
+                ArrayList<EnhancedDebugger> debuggersToRemove = new ArrayList<>();
                 // Remove all the debuggers of which their connections are no longer valid
                 for (int index = 0; index < tabbedPane.getComponentCount() - 1; index++) {
                     EnhancedDebugger debugger = debuggers.get(index);
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java
index f6d63952d..b0e1f9685 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java
@@ -123,7 +123,7 @@ public class CarbonExtension implements ExtensionElement {
     /**
      * Defines the direction of a {@link CarbonExtension} message.
      */
-    public static enum Direction {
+    public enum Direction {
         received,
         sent
     }
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/eme/element/ExplicitMessageEncryptionElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/eme/element/ExplicitMessageEncryptionElement.java
index c98f22cd4..04e0df9c6 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/eme/element/ExplicitMessageEncryptionElement.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/eme/element/ExplicitMessageEncryptionElement.java
@@ -48,7 +48,7 @@ public class ExplicitMessageEncryptionElement implements ExtensionElement {
         private final String namespace;
         private final String name;
 
-        private ExplicitMessageEncryptionProtocol(String namespace, String name) {
+        ExplicitMessageEncryptionProtocol(String namespace, String name) {
             this.namespace = namespace;
             this.name = name;
             PROTOCOL_LUT.put(namespace, this);
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/AbstractHttpOverXmpp.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/AbstractHttpOverXmpp.java
index 0842b15ae..03f335e02 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/AbstractHttpOverXmpp.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/AbstractHttpOverXmpp.java
@@ -90,7 +90,7 @@ public abstract class AbstractHttpOverXmpp extends IQ {
     /**
      * A builder for XMPP connection configurations.
      * <p>
-     * See ConnectionConfiguration Buidler for more details.
+     * See ConnectionConfiguration Builder for more details.
      * </p>
      *
      * @param <B> the builder type parameter.
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/ThingControlRequest.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/ThingControlRequest.java
index 3eb58e40e..cfdc245c7 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/ThingControlRequest.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/ThingControlRequest.java
@@ -26,6 +26,6 @@ import org.jxmpp.jid.Jid;
 
 public interface ThingControlRequest {
 
-    public void processRequest(Jid from, Collection<SetData> setData) throws XMPPErrorException;
+    void processRequest(Jid from, Collection<SetData> setData) throws XMPPErrorException;
 
 }
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/element/IoTSetResponse.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/element/IoTSetResponse.java
index a742355af..68fce1441 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/element/IoTSetResponse.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/element/IoTSetResponse.java
@@ -29,7 +29,7 @@ public class IoTSetResponse extends IQ {
 
     public IoTSetResponse(IoTSetRequest iotSetRequest) {
         this();
-        initialzeAsResultFor(iotSetRequest);
+        initializeAsResultFor(iotSetRequest);
     }
 
     @Override
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/element/SetData.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/element/SetData.java
index 4d9e29286..e2e004f00 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/element/SetData.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/element/SetData.java
@@ -32,7 +32,7 @@ public abstract class SetData implements NamedElement {
 
         private final String toStringCache;
 
-        private Type() {
+        Type() {
             toStringCache = this.name().toLowerCase(Locale.US);
         }
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/ThingMomentaryReadOutRequest.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/ThingMomentaryReadOutRequest.java
index f7d2a1b59..9f3652054 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/ThingMomentaryReadOutRequest.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/ThingMomentaryReadOutRequest.java
@@ -18,6 +18,6 @@ package org.jivesoftware.smackx.iot.data;
 
 public interface ThingMomentaryReadOutRequest {
 
-    public void momentaryReadOutRequest(ThingMomentaryReadOutResult callback);
+    void momentaryReadOutRequest(ThingMomentaryReadOutResult callback);
 
 }
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/ThingMomentaryReadOutResult.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/ThingMomentaryReadOutResult.java
index 4662552af..0f8cb431a 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/ThingMomentaryReadOutResult.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/ThingMomentaryReadOutResult.java
@@ -22,6 +22,6 @@ import org.jivesoftware.smackx.iot.data.element.IoTDataField;
 
 public interface ThingMomentaryReadOutResult {
 
-    public void momentaryReadOut(List<? extends IoTDataField> results);
+    void momentaryReadOut(List<? extends IoTDataField> results);
 
 }
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/IoTDataRequest.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/IoTDataRequest.java
index 70f3df80d..7c370e10b 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/IoTDataRequest.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/IoTDataRequest.java
@@ -24,7 +24,7 @@ public class IoTDataRequest extends IQ {
     public static final String NAMESPACE = Constants.IOT_SENSORDATA_NAMESPACE;
 
     /**
-     * The sequence nummber. According to XEP-0323 an xs:int.
+     * The sequence number. According to XEP-0323 an xs:int.
      */
     private final int seqNr;
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/ThingStateChangeListener.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/ThingStateChangeListener.java
index b64d67d21..7e688adaa 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/ThingStateChangeListener.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/ThingStateChangeListener.java
@@ -20,6 +20,6 @@ import org.jxmpp.jid.BareJid;
 
 public interface ThingStateChangeListener {
 
-    public void owned(BareJid owner);
+    void owned(BareJid owner);
 
 }
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/Tag.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/Tag.java
index 0ea8c6b4f..495e5019b 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/Tag.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/Tag.java
@@ -25,7 +25,7 @@ public class Tag implements NamedElement {
 
     public enum Type {
         str,
-        num;
+        num
     }
 
     private final String name;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/IoTProvisioningManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/IoTProvisioningManager.java
index a1d2c9cfe..6e6177cba 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/IoTProvisioningManager.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/IoTProvisioningManager.java
@@ -161,8 +161,8 @@ public final class IoTProvisioningManager extends Manager {
                     // Notify the recommended friend that we will now accept his
                     // friendship requests.
                     final XMPPConnection connection = connection();
-                    Friend friendNotifiacation = new Friend(connection.getUser().asBareJid());
-                    Message notificationMessage = new Message(friendJid, friendNotifiacation);
+                    Friend friendNotification = new Friend(connection.getUser().asBareJid());
+                    Message notificationMessage = new Message(friendJid, friendNotification);
                     connection.sendStanza(notificationMessage);
                 } else {
                     // Check is the message was send from a thing we previously
@@ -236,7 +236,7 @@ public final class IoTProvisioningManager extends Manager {
                 }
                 catch (NoResponseException | XMPPErrorException | NotConnectedException | InterruptedException e) {
                     LOGGER.log(Level.WARNING,
-                                    "Could not determine privisioning server. Ignoring friend request from " + from, e);
+                                    "Could not determine provisioning server. Ignoring friend request from " + from, e);
                 }
                 if (provisioningServer == null) {
                     return null;
@@ -420,7 +420,7 @@ public final class IoTProvisioningManager extends Manager {
         if (!provisioningServer.equals(stanza.getFrom())) {
             if (log) {
                 LOGGER.warning("Ignoring  request '" + stanza
-                                + "' because not from provising server '" + provisioningServer
+                                + "' because not from provisioning server '" + provisioningServer
                                 + "'.");
             }
             return false;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/MamManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/MamManager.java
index 9d800f73c..35abea501 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/MamManager.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/MamManager.java
@@ -239,11 +239,11 @@ public final class MamManager extends Manager {
 
 
     /**
-     * Query an message archive like a MUC archive or a pubsub node archive, addressed by an archiveAddress, applying
+     * Query an message archive like a MUC archive or a PubSub node archive, addressed by an archiveAddress, applying
      * filters: max count, start date, end date, from/to JID and with additional fields. When archiveAddress is null the
      * default, the server will be requested.
      * 
-     * @param node The Pubsub node name, can be null
+     * @param node The PubSub node name, can be null
      * @param max
      * @param start
      * @param end
@@ -346,7 +346,7 @@ public final class MamManager extends Manager {
     /**
      * Returns a page of the archive.
      * 
-     * @param node The Pubsub node name, can be null
+     * @param node The PubSub node name, can be null
      * @param dataForm
      * @param rsmSet
      * @return the MAM query result
@@ -498,7 +498,7 @@ public final class MamManager extends Manager {
     /**
      * Get the form fields supported by the server.
      * 
-     * @param node The Pubsub node name, can be null
+     * @param node The PubSub node name, can be null
      * @return the list of form fields.
      * @throws NoResponseException
      * @throws XMPPErrorException
@@ -521,7 +521,7 @@ public final class MamManager extends Manager {
     private MamQueryResult queryArchive(MamQueryIQ mamQueryIq) throws NoResponseException, XMPPErrorException,
             NotConnectedException, InterruptedException, NotLoggedInException {
         final XMPPConnection connection = getAuthenticatedConnectionOrThrow();
-        MamFinIQ mamFinIQ = null;
+        MamFinIQ mamFinIQ;
 
         StanzaCollector mamFinIQCollector = connection.createStanzaCollector(new IQReplyFilter(mamQueryIq, connection));
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLight.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLight.java
index 41f13b8e3..dee356819 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLight.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLight.java
@@ -82,7 +82,7 @@ public class MultiUserChatLight {
      * Same as {@link #fromRoomFilter} together with
      * {@link MessageTypeFilter#GROUPCHAT}.
      */
-    private final StanzaFilter fromRoomGroupchatFilter;
+    private final StanzaFilter fromRoomGroupChatFilter;
 
     private final StanzaListener messageListener;
 
@@ -93,7 +93,7 @@ public class MultiUserChatLight {
         this.room = room;
 
         fromRoomFilter = FromMatchesFilter.create(room);
-        fromRoomGroupchatFilter = new AndFilter(fromRoomFilter, MessageTypeFilter.GROUPCHAT);
+        fromRoomGroupChatFilter = new AndFilter(fromRoomFilter, MessageTypeFilter.GROUPCHAT);
 
         messageListener = new StanzaListener() {
             @Override
@@ -105,7 +105,7 @@ public class MultiUserChatLight {
             }
         };
 
-        connection.addSyncStanzaListener(messageListener, fromRoomGroupchatFilter);
+        connection.addSyncStanzaListener(messageListener, fromRoomGroupChatFilter);
     }
 
     /**
@@ -265,7 +265,7 @@ public class MultiUserChatLight {
             throws Exception {
         MUCLightCreateIQ createMUCLightIQ = new MUCLightCreateIQ(room, roomName, occupants);
 
-        messageCollector = connection.createStanzaCollector(fromRoomGroupchatFilter);
+        messageCollector = connection.createStanzaCollector(fromRoomGroupChatFilter);
 
         try {
             connection.createStanzaCollectorAndSend(createMUCLightIQ).nextResultOrThrow();
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLightManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLightManager.java
index 81f270c16..67e8fdd77 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLightManager.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLightManager.java
@@ -96,7 +96,7 @@ public final class MultiUserChatLightManager extends Manager {
 
     private MultiUserChatLight createNewMucLightAndAddToMap(EntityBareJid jid) {
         MultiUserChatLight multiUserChatLight = new MultiUserChatLight(connection(), jid);
-        multiUserChatLights.put(jid, new WeakReference<MultiUserChatLight>(multiUserChatLight));
+        multiUserChatLights.put(jid, new WeakReference<>(multiUserChatLight));
         return multiUserChatLight;
     }
 
@@ -193,11 +193,11 @@ public final class MultiUserChatLightManager extends Manager {
      */
     public List<Jid> getRoomsBlocked(DomainBareJid mucLightService)
             throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
-        MUCLightBlockingIQ muclIghtBlockingIQResult = getBlockingList(mucLightService);
+        MUCLightBlockingIQ mucLightBlockingIQResult = getBlockingList(mucLightService);
 
         List<Jid> jids = new ArrayList<>();
-        if (muclIghtBlockingIQResult.getRooms() != null) {
-            jids.addAll(muclIghtBlockingIQResult.getRooms().keySet());
+        if (mucLightBlockingIQResult.getRooms() != null) {
+            jids.addAll(mucLightBlockingIQResult.getRooms().keySet());
         }
 
         return jids;
@@ -215,11 +215,11 @@ public final class MultiUserChatLightManager extends Manager {
      */
     public List<Jid> getUsersBlocked(DomainBareJid mucLightService)
             throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
-        MUCLightBlockingIQ muclIghtBlockingIQResult = getBlockingList(mucLightService);
+        MUCLightBlockingIQ mucLightBlockingIQResult = getBlockingList(mucLightService);
 
         List<Jid> jids = new ArrayList<>();
-        if (muclIghtBlockingIQResult.getUsers() != null) {
-            jids.addAll(muclIghtBlockingIQResult.getUsers().keySet());
+        if (mucLightBlockingIQResult.getUsers() != null) {
+            jids.addAll(mucLightBlockingIQResult.getUsers().keySet());
         }
 
         return jids;
@@ -234,9 +234,9 @@ public final class MultiUserChatLightManager extends Manager {
         StanzaFilter responseFilter = new IQReplyFilter(mucLightBlockingIQ, connection());
         IQ responseIq = connection().createStanzaCollectorAndSend(responseFilter, mucLightBlockingIQ)
                 .nextResultOrThrow();
-        MUCLightBlockingIQ muclIghtBlockingIQResult = (MUCLightBlockingIQ) responseIq;
+        MUCLightBlockingIQ mucLightBlockingIQResult = (MUCLightBlockingIQ) responseIq;
 
-        return muclIghtBlockingIQResult;
+        return mucLightBlockingIQResult;
     }
 
     /**
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/ExperimentalInitializerTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/ExperimentalInitializerTest.java
index 48cca1e63..dff548f50 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/ExperimentalInitializerTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/ExperimentalInitializerTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 public class ExperimentalInitializerTest {
 
     @Test
-    public void testExperimentalInitialzer() {
+    public void testExperimentalInitializer() {
         ExperimentalInitializer epi = new ExperimentalInitializer();
         List<Exception> exceptions = epi.initialize();
         assertTrue(exceptions.size() == 0);
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java
index acf139c6e..d0dbc2cf9 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.carbons;
 
-import static org.jivesoftware.smack.test.util.CharsequenceEquals.equalsCharSequence;
+import static org.jivesoftware.smack.test.util.CharSequenceEquals.equalsCharSequence;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/AcknowledgedExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/AcknowledgedExtensionTest.java
index 3ed4d3c12..b7d7eb595 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/AcknowledgedExtensionTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/AcknowledgedExtensionTest.java
@@ -49,7 +49,7 @@ public class AcknowledgedExtensionTest {
         AcknowledgedExtension acknowledgedExtension1 = new AcknowledgedProvider().parse(parser);
         Assert.assertEquals("message-1", acknowledgedExtension1.getId());
 
-        Message message = (Message) PacketParserUtils.parseStanza(acknowledgedMessageStanza);
+        Message message = PacketParserUtils.parseStanza(acknowledgedMessageStanza);
         AcknowledgedExtension acknowledgedExtension2 = AcknowledgedExtension.from(message);
         Assert.assertEquals("message-1", acknowledgedExtension2.getId());
     }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/DisplayedExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/DisplayedExtensionTest.java
index fd8161e8b..bba42c13c 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/DisplayedExtensionTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/DisplayedExtensionTest.java
@@ -49,7 +49,7 @@ public class DisplayedExtensionTest {
         DisplayedExtension displayedExtension1 = new DisplayedProvider().parse(parser);
         Assert.assertEquals("message-1", displayedExtension1.getId());
 
-        Message message = (Message) PacketParserUtils.parseStanza(displayedMessageStanza);
+        Message message = PacketParserUtils.parseStanza(displayedMessageStanza);
         DisplayedExtension displayedExtension2 = DisplayedExtension.from(message);
         Assert.assertEquals("message-1", displayedExtension2.getId());
     }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/MarkableExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/MarkableExtensionTest.java
index 3c28d10cb..e62e0cd98 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/MarkableExtensionTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/MarkableExtensionTest.java
@@ -51,7 +51,7 @@ public class MarkableExtensionTest {
         MarkableExtension markableExtension1 = new MarkableProvider().parse(parser);
         Assert.assertEquals(markableExtension, markableExtension1.toXML().toString());
 
-        Message message = (Message) PacketParserUtils.parseStanza(markableMessageStanza);
+        Message message = PacketParserUtils.parseStanza(markableMessageStanza);
         MarkableExtension markableExtension2 = MarkableExtension.from(message);
         Assert.assertEquals(markableExtension, markableExtension2.toXML().toString());
     }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/ReceivedExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/ReceivedExtensionTest.java
index d34dc8088..31d668571 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/ReceivedExtensionTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/ReceivedExtensionTest.java
@@ -49,7 +49,7 @@ public class ReceivedExtensionTest {
         ReceivedExtension receivedExtension1 = new ReceivedProvider().parse(parser);
         Assert.assertEquals("message-1", receivedExtension1.getId());
 
-        Message message = (Message) PacketParserUtils.parseStanza(receivedMessageStanza);
+        Message message = PacketParserUtils.parseStanza(receivedMessageStanza);
         ReceivedExtension receivedExtension2 = ReceivedExtension.from(message);
         Assert.assertEquals("message-1", receivedExtension2.getId());
     }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProviderTest.java
index e1dc35b78..d64427dde 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProviderTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProviderTest.java
@@ -72,7 +72,6 @@ public class HttpOverXmppReqProviderTest {
         XmlPullParser parser = PacketParserUtils.getParserFor(string);
         IQ iq = provider.parse(parser);
         assertTrue(iq instanceof HttpOverXmppReq);
-        HttpOverXmppReq castedIq = (HttpOverXmppReq) iq;
-        return castedIq;
+        return  (HttpOverXmppReq) iq;
     }
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/FileTooLargeErrorCreateTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/FileTooLargeErrorCreateTest.java
index 157dc77c4..eb7333b6d 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/FileTooLargeErrorCreateTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/FileTooLargeErrorCreateTest.java
@@ -22,7 +22,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 public class FileTooLargeErrorCreateTest {
-    String fileTooLargeErrorExtensionExample
+    private static final String fileTooLargeErrorExtensionExample
             = "<file-too-large xmlns='urn:xmpp:http:upload:0'>"
             +   "<max-file-size>20000</max-file-size>"
             + "</file-too-large>";
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotCreateTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotCreateTest.java
index 151c0e015..73b71d93d 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotCreateTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotCreateTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 import org.xml.sax.SAXException;
 
 public class SlotCreateTest {
-    String testSlot
+    private static final String testSlot
             = "<slot xmlns='urn:xmpp:http:upload:0'>"
             +     "<put url='https://upload.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/my_juliet.png'></put>"
             +     "<get url='https://download.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/my_juliet.png'></get>"
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotRequestCreateTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotRequestCreateTest.java
index 525322357..d49ebee73 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotRequestCreateTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotRequestCreateTest.java
@@ -29,14 +29,14 @@ import org.xml.sax.SAXException;
 
 public class SlotRequestCreateTest {
 
-    String testRequest
+    private static final String testRequest
             = "<request xmlns='urn:xmpp:http:upload:0'"
             +   " filename='my_juliet.png'"
             +   " size='23456'"
             +   " content-type='image/jpeg'"
             + "/>";
 
-    String testRequestWithoutContentType
+    private static final String testRequestWithoutContentType
             = "<request xmlns='urn:xmpp:http:upload:0'"
             +   " filename='my_romeo.png'"
             +   " size='52523'"
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/FileTooLargeErrorProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/FileTooLargeErrorProviderTest.java
index 079109371..5983baeec 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/FileTooLargeErrorProviderTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/FileTooLargeErrorProviderTest.java
@@ -30,7 +30,7 @@ public class FileTooLargeErrorProviderTest {
      * Example 7. Alternative response by the upload service if the file size was too large
      * @see <a href="http://xmpp.org/extensions/xep-0363.html#errors">XEP-0363: HTTP File Upload 5. Error conditions</a>
      */
-    String slotErrorFileToLarge
+    private static final String slotErrorFileToLarge
             = "<iq from='upload.montague.tld' "
             +       "id='step_03' "
             +       "to='romeo@montague.tld/garden' "
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamFinProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamFinProviderTest.java
index d74878e8a..fb8bbf95d 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamFinProviderTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamFinProviderTest.java
@@ -61,7 +61,7 @@ public class MamFinProviderTest extends MamTest {
                         + "</iq>";
         // @formatter:on
 
-        IQ iq = (IQ) PacketParserUtils.parseStanza(IQ_LIMITED_RESULTS_EXAMPLE);
+        IQ iq = PacketParserUtils.parseStanza(IQ_LIMITED_RESULTS_EXAMPLE);
 
         MamFinIQ mamFinIQ = (MamFinIQ) iq;
         Assert.assertEquals(mamFinIQ.getType(), Type.result);
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamPrefIQProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamPrefIQProviderTest.java
index fe56ca81b..0e89b9b69 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamPrefIQProviderTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamPrefIQProviderTest.java
@@ -31,18 +31,18 @@ import org.xmlpull.v1.XmlPullParser;
 
 public class MamPrefIQProviderTest extends MamTest {
 
-    String exampleMamPrefsIQ1 = "<iq type='set' id='juliet3'>" + "<prefs xmlns='urn:xmpp:mam:1' default='roster'>"
+    private static final String exampleMamPrefsIQ1 = "<iq type='set' id='juliet3'>" + "<prefs xmlns='urn:xmpp:mam:1' default='roster'>"
             + "<always>" + "<jid>romeo@montague.lit</jid>" + "</always>" + "<never>"
             + "<jid>montague@montague.lit</jid>" + "</never>" + "</prefs>" + "</iq>";
 
-    String exampleMamPrefsIQ2 = "<iq type='set' id='juliet3'>" + "<prefs xmlns='urn:xmpp:mam:1' default='roster'>"
+    private static final String exampleMamPrefsIQ2 = "<iq type='set' id='juliet3'>" + "<prefs xmlns='urn:xmpp:mam:1' default='roster'>"
             + "<always>" + "<jid>romeo@montague.lit</jid>" + "<jid>montague@montague.lit</jid>" + "</always>"
             + "<never>" + "</never>" + "</prefs>" + "</iq>";
 
-    String exampleMamPrefsIQ3 = "<iq type='get' id='juliet3'>" + "<prefs xmlns='urn:xmpp:mam:1'>" + "</prefs>"
+    private static final String exampleMamPrefsIQ3 = "<iq type='get' id='juliet3'>" + "<prefs xmlns='urn:xmpp:mam:1'>" + "</prefs>"
             + "</iq>";
 
-    String exampleMamPrefsResultIQ = "<iq type='result' id='juliet3'>"
+    private static final String exampleMamPrefsResultIQ = "<iq type='result' id='juliet3'>"
             + "<prefs xmlns='urn:xmpp:mam:1' default='roster'>" + "<always>" + "<jid>romeo@montague.lit</jid>"
             + "</always>" + "<never>" + "<jid>sarasa@montague.lit</jid>" + "<jid>montague@montague.lit</jid>"
             + "</never>" + "</prefs>" + "</iq>";
@@ -53,14 +53,14 @@ public class MamPrefIQProviderTest extends MamTest {
         MamPrefsIQ mamPrefIQ1 = new MamPrefsIQProvider().parse(parser1);
 
         Assert.assertEquals(IQ.Type.set, mamPrefIQ1.getType());
-        Assert.assertEquals(mamPrefIQ1.getAlwaysJids().get(0), "romeo@montague.lit");
-        Assert.assertEquals(mamPrefIQ1.getNeverJids().get(0), "montague@montague.lit");
+        Assert.assertEquals(mamPrefIQ1.getAlwaysJids().get(0).toString(), "romeo@montague.lit");
+        Assert.assertEquals(mamPrefIQ1.getNeverJids().get(0).toString(), "montague@montague.lit");
 
         XmlPullParser parser2 = PacketParserUtils.getParserFor(exampleMamPrefsIQ2);
         MamPrefsIQ mamPrefIQ2 = new MamPrefsIQProvider().parse(parser2);
         Assert.assertEquals(IQ.Type.set, mamPrefIQ2.getType());
-        Assert.assertEquals(mamPrefIQ2.getAlwaysJids().get(0), "romeo@montague.lit");
-        Assert.assertEquals(mamPrefIQ2.getAlwaysJids().get(1), "montague@montague.lit");
+        Assert.assertEquals(mamPrefIQ2.getAlwaysJids().get(0).toString(), "romeo@montague.lit");
+        Assert.assertEquals(mamPrefIQ2.getAlwaysJids().get(1).toString(), "montague@montague.lit");
         Assert.assertTrue(mamPrefIQ2.getNeverJids().isEmpty());
 
         XmlPullParser parser3 = PacketParserUtils.getParserFor(exampleMamPrefsIQ3);
@@ -70,7 +70,7 @@ public class MamPrefIQProviderTest extends MamTest {
 
     @Test
     public void checkMamPrefResult() throws Exception {
-        IQ iq = (IQ) PacketParserUtils.parseStanza(exampleMamPrefsResultIQ);
+        IQ iq = PacketParserUtils.parseStanza(exampleMamPrefsResultIQ);
 
         MamPrefsIQ mamPrefsIQ = (MamPrefsIQ) iq;
 
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamQueryIQProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamQueryIQProviderTest.java
index b9236ad08..2c62f988b 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamQueryIQProviderTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamQueryIQProviderTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
 
 public class MamQueryIQProviderTest {
 
-    String exampleMamQueryIQ1 = "<iq type='set' id='query4'>" + "<query xmlns='urn:xmpp:mam:1' queryid='test'>"
+    private static final String exampleMamQueryIQ1 = "<iq type='set' id='query4'>" + "<query xmlns='urn:xmpp:mam:1' queryid='test'>"
             + "<x xmlns='jabber:x:data' type='submit'>" + "<field type='hidden' var='FORM_TYPE'>"
             + "<value>urn:xmpp:mam:1</value>" + "</field>"
             + "<field type='text-single' var='urn:example:xmpp:free-text-search'>"
@@ -41,7 +41,7 @@ public class MamQueryIQProviderTest {
             + "<value>{http://jabber.org/protocol/mood}mood/lonely</value>" + "</field>" + "</x>" + "</query>"
             + "</iq>";
 
-    String exampleMamQueryIQ2 = "<iq type='result' id='form1'>" + "<query xmlns='urn:xmpp:mam:1'>"
+    private static final String exampleMamQueryIQ2 = "<iq type='result' id='form1'>" + "<query xmlns='urn:xmpp:mam:1'>"
             + "<x xmlns='jabber:x:data' type='form'>" + "<field type='hidden' var='FORM_TYPE'>"
             + "<value>urn:xmpp:mam:1</value>" + "</field>" + "<field type='jid-single' var='with'/>"
             + "<field type='text-single' var='start'/>" + "<field type='text-single' var='end'/>"
@@ -51,7 +51,7 @@ public class MamQueryIQProviderTest {
     @Test
     public void checkMamQueryIQProvider() throws Exception {
         // example 1
-        IQ iq1 = (IQ) PacketParserUtils.parseStanza(exampleMamQueryIQ1);
+        IQ iq1 = PacketParserUtils.parseStanza(exampleMamQueryIQ1);
         MamQueryIQ mamQueryIQ1 = (MamQueryIQ) iq1;
 
         Assert.assertEquals(mamQueryIQ1.getType(), Type.set);
@@ -67,7 +67,7 @@ public class MamQueryIQProviderTest {
         Assert.assertEquals(fields1.get(2).getValues().get(0), "{http://jabber.org/protocol/mood}mood/lonely");
 
         // example2
-        IQ iq2 = (IQ) PacketParserUtils.parseStanza(exampleMamQueryIQ2);
+        IQ iq2 = PacketParserUtils.parseStanza(exampleMamQueryIQ2);
         MamQueryIQ mamQueryIQ2 = (MamQueryIQ) iq2;
 
         Assert.assertEquals(mamQueryIQ2.getType(), Type.result);
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamResultProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamResultProviderTest.java
index 89535a1a5..4d0c0c145 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamResultProviderTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamResultProviderTest.java
@@ -33,14 +33,14 @@ import org.xmlpull.v1.XmlPullParser;
 
 public class MamResultProviderTest {
 
-    String exampleMamResultXml = "<result xmlns='urn:xmpp:mam:1' queryid='f27' id='28482-98726-73623'>"
+    private static final String exampleMamResultXml = "<result xmlns='urn:xmpp:mam:1' queryid='f27' id='28482-98726-73623'>"
             + "<forwarded xmlns='urn:xmpp:forward:0'>" + "<delay xmlns='urn:xmpp:delay' stamp='2010-07-10T23:08:25Z'/>"
             + "<message xmlns='jabber:client'" + "to='juliet@capulet.lit/balcony'" + "from='romeo@montague.lit/orchard'"
             + "type='chat'>"
             + "<body>Call me but love, and I'll be new baptized; Henceforth I never will be Romeo.</body>"
             + "</message>" + "</forwarded>" + "</result>";
 
-    String exampleResultMessage = "<message id='aeb213' to='juliet@capulet.lit/chamber'>"
+    private static final String exampleResultMessage = "<message id='aeb213' to='juliet@capulet.lit/chamber'>"
             + "<result xmlns='urn:xmpp:mam:1' queryid='f27' id='28482-98726-73623'>"
             + "<forwarded xmlns='urn:xmpp:forward:0'>" + "<delay xmlns='urn:xmpp:delay' stamp='2010-07-10T23:08:25Z'/>"
             + "<message xmlns='jabber:client' from='witch@shakespeare.lit' to='macbeth@shakespeare.lit'>"
@@ -62,15 +62,15 @@ public class MamResultProviderTest {
         Assert.assertEquals(forwarded.getDelayInformation().getStamp(), date);
 
         Message message = (Message) forwarded.getForwardedStanza();
-        Assert.assertEquals(message.getFrom(), "romeo@montague.lit/orchard");
-        Assert.assertEquals(message.getTo(), "juliet@capulet.lit/balcony");
+        Assert.assertEquals(message.getFrom().toString(), "romeo@montague.lit/orchard");
+        Assert.assertEquals(message.getTo().toString(), "juliet@capulet.lit/balcony");
         Assert.assertEquals(message.getBody(),
                 "Call me but love, and I'll be new baptized; Henceforth I never will be Romeo.");
     }
 
     @Test
     public void checkResultsParse() throws Exception {
-        Message message = (Message) PacketParserUtils.parseStanza(exampleResultMessage);
+        Message message = PacketParserUtils.parseStanza(exampleResultMessage);
         MamResultExtension mamResultExtension = MamResultExtension.from(message);
 
         Assert.assertEquals(mamResultExtension.getQueryId(), "f27");
@@ -84,8 +84,8 @@ public class MamResultProviderTest {
         Assert.assertEquals(forwarded.getDelayInformation().getStamp(), date);
 
         Message forwardedMessage = (Message) forwarded.getForwardedStanza();
-        Assert.assertEquals(forwardedMessage.getFrom(), "witch@shakespeare.lit");
-        Assert.assertEquals(forwardedMessage.getTo(), "macbeth@shakespeare.lit");
+        Assert.assertEquals(forwardedMessage.getFrom().toString(), "witch@shakespeare.lit");
+        Assert.assertEquals(forwardedMessage.getTo().toString(), "macbeth@shakespeare.lit");
         Assert.assertEquals(forwardedMessage.getBody(), "Hail to thee");
     }
 
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PreferencesTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PreferencesTest.java
index 52fe85822..fc5b9951c 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PreferencesTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PreferencesTest.java
@@ -30,10 +30,10 @@ import org.jxmpp.jid.impl.JidCreate;
 
 public class PreferencesTest {
 
-    String retrievePrefsStanzaExample = "<iq id='sarasa' type='get'>" + "<prefs xmlns='" + MamElements.NAMESPACE
+    private static final String retrievePrefsStanzaExample = "<iq id='sarasa' type='get'>" + "<prefs xmlns='" + MamElements.NAMESPACE
             + "'/>" + "</iq>";
 
-    String updatePrefsStanzaExample = "<iq id='sarasa' type='set'>" + "<prefs xmlns='" + MamElements.NAMESPACE
+    private static final String updatePrefsStanzaExample = "<iq id='sarasa' type='set'>" + "<prefs xmlns='" + MamElements.NAMESPACE
             + "' default='roster'>" + "<always>" + "<jid>romeo@montague.lit</jid>" + "<jid>other@montague.lit</jid>"
             + "</always>" + "<never>" + "<jid>montague@montague.lit</jid>" + "</never>" + "</prefs>" + "</iq>";
 
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/QueryArchiveTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/QueryArchiveTest.java
index 2603b7d63..af5d87a61 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/QueryArchiveTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/QueryArchiveTest.java
@@ -37,11 +37,11 @@ import org.jxmpp.jid.impl.JidCreate;
 
 public class QueryArchiveTest extends MamTest {
 
-    String mamSimpleQueryIQ = "<iq id='sarasa' type='set'>" + "<query xmlns='urn:xmpp:mam:1' queryid='testid'>"
+    private static final String mamSimpleQueryIQ = "<iq id='sarasa' type='set'>" + "<query xmlns='urn:xmpp:mam:1' queryid='testid'>"
             + "<x xmlns='jabber:x:data' type='submit'>" + "<field var='FORM_TYPE' type='hidden'>" + "<value>"
             + MamElements.NAMESPACE + "</value>" + "</field>" + "</x>" + "</query>" + "</iq>";
 
-    String mamQueryResultExample = "<message to='hag66@shakespeare.lit/pda' from='coven@chat.shakespeare.lit' id='iasd207'>"
+    private static final String mamQueryResultExample = "<message to='hag66@shakespeare.lit/pda' from='coven@chat.shakespeare.lit' id='iasd207'>"
             + "<result xmlns='urn:xmpp:mam:1' queryid='g27' id='34482-21985-73620'>"
             + "<forwarded xmlns='urn:xmpp:forward:0'>"
             + "<delay xmlns='urn:xmpp:delay' stamp='2002-10-13T23:58:37.000+00:00'></delay>" + "<message "
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/ResultsLimitTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/ResultsLimitTest.java
index a2df5535b..721cc2298 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/ResultsLimitTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/ResultsLimitTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 
 public class ResultsLimitTest extends MamTest {
 
-    String resultsLimitStanza = "<iq id='sarasa' type='set'>" + "<query xmlns='urn:xmpp:mam:1' queryid='testid'>"
+    private static final String resultsLimitStanza = "<iq id='sarasa' type='set'>" + "<query xmlns='urn:xmpp:mam:1' queryid='testid'>"
             + "<x xmlns='jabber:x:data' type='submit'>" + "<field var='FORM_TYPE' type='hidden'>" + "<value>"
             + MamElements.NAMESPACE + "</value>" + "</field>" + "</x>" + "<set xmlns='http://jabber.org/protocol/rsm'>"
             + "<max>10</max>" + "</set>" + "</query>" + "</iq>";
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightAffiliationsChangeExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightAffiliationsChangeExtensionTest.java
index ef67ddf77..bc7c74059 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightAffiliationsChangeExtensionTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightAffiliationsChangeExtensionTest.java
@@ -30,19 +30,19 @@ import org.jxmpp.jid.impl.JidCreate;
 
 public class MUCLightAffiliationsChangeExtensionTest {
 
-    String exampleMessageStanza = "<message " + "to='coven@muclight.shakespeare.lit' id='member1' type='groupchat'>"
+    private static final String exampleMessageStanza = "<message " + "to='coven@muclight.shakespeare.lit' id='member1' type='groupchat'>"
             + "<x xmlns='urn:xmpp:muclight:0#affiliations'>"
             + "<user affiliation='owner'>sarasa2@shakespeare.lit</user>"
             + "<user affiliation='member'>sarasa1@shakespeare.lit</user>"
             + "<user affiliation='none'>sarasa3@shakespeare.lit</user>" + "</x>" + "</message>";
 
-    String exampleMessageStanzaWithVersion = "<message "
+    private static final String exampleMessageStanzaWithVersion = "<message "
             + "to='coven@muclight.shakespeare.lit' id='member1' type='groupchat'>"
             + "<x xmlns='urn:xmpp:muclight:0#affiliations'>" + "<version>qwerty</version>"
             + "<user affiliation='member'>sarasa1@shakespeare.lit</user>"
             + "<user affiliation='none'>sarasa3@shakespeare.lit</user>" + "</x>" + "<body></body>" + "</message>";
 
-    String exampleMessageStanzaWithPrevVersion = "<message "
+    private static final String exampleMessageStanzaWithPrevVersion = "<message "
             + "to='coven@muclight.shakespeare.lit' id='member1' type='groupchat'>"
             + "<x xmlns='urn:xmpp:muclight:0#affiliations'>" + "<prev-version>njiokm</prev-version>"
             + "<version>qwerty</version>" + "<user affiliation='owner'>sarasa2@shakespeare.lit</user>"
@@ -50,7 +50,7 @@ public class MUCLightAffiliationsChangeExtensionTest {
 
     @Test
     public void checkAffiliationsChangeExtension() throws Exception {
-        Message changeAffiliationsMessage = (Message) PacketParserUtils.parseStanza(exampleMessageStanza);
+        Message changeAffiliationsMessage = PacketParserUtils.parseStanza(exampleMessageStanza);
         AffiliationsChangeExtension affiliationsChangeExtension = AffiliationsChangeExtension
                 .from(changeAffiliationsMessage);
 
@@ -63,7 +63,7 @@ public class MUCLightAffiliationsChangeExtensionTest {
 
     @Test
     public void checkAffiliationsChangeExtensionWithVersion() throws Exception {
-        Message changeAffiliationsMessage = (Message) PacketParserUtils.parseStanza(exampleMessageStanzaWithVersion);
+        Message changeAffiliationsMessage = PacketParserUtils.parseStanza(exampleMessageStanzaWithVersion);
         AffiliationsChangeExtension affiliationsChangeExtension = AffiliationsChangeExtension
                 .from(changeAffiliationsMessage);
 
@@ -77,7 +77,7 @@ public class MUCLightAffiliationsChangeExtensionTest {
 
     @Test
     public void checkAffiliationsChangeExtensionWithPrevVersion() throws Exception {
-        Message changeAffiliationsMessage = (Message) PacketParserUtils
+        Message changeAffiliationsMessage = PacketParserUtils
                 .parseStanza(exampleMessageStanzaWithPrevVersion);
         AffiliationsChangeExtension affiliationsChangeExtension = AffiliationsChangeExtension
                 .from(changeAffiliationsMessage);
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightBlockingTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightBlockingTest.java
index a92bb86de..db34f9548 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightBlockingTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightBlockingTest.java
@@ -31,25 +31,25 @@ import org.jxmpp.jid.impl.JidCreate;
 
 public class MUCLightBlockingTest {
 
-    String getBlockingListIQExample = "<iq to='muclight.shakespeare.lit' id='getblock1' type='get'>"
+    private static final String getBlockingListIQExample = "<iq to='muclight.shakespeare.lit' id='getblock1' type='get'>"
             + "<query xmlns='urn:xmpp:muclight:0#blocking'>" + "</query>" + "</iq>";
 
-    String getBlockingListIQResponse = "<iq type='result' id='getblock1' to='crone1@shakespeare.lit/desktop' from='muclight.shakespeare.lit'>"
+    private static final String getBlockingListIQResponse = "<iq type='result' id='getblock1' to='crone1@shakespeare.lit/desktop' from='muclight.shakespeare.lit'>"
             + "<query xmlns='urn:xmpp:muclight:0#blocking'>"
             + "<room action='deny'>coven@muclight.shakespeare.lit</room>"
             + "<room action='deny'>sarasa@muclight.shakespeare.lit</room>"
             + "<user action='deny'>hag77@shakespeare.lit</user>" + "</query>" + "</iq>";
 
-    String blockingRoomsIQExample = "<iq to='muclight.shakespeare.lit' id='block1' type='set'>"
+    private static final String blockingRoomsIQExample = "<iq to='muclight.shakespeare.lit' id='block1' type='set'>"
             + "<query xmlns='urn:xmpp:muclight:0#blocking'>"
             + "<room action='deny'>coven@muclight.shakespeare.lit</room>"
             + "<room action='deny'>chapel@shakespeare.lit</room>" + "</query>" + "</iq>";
 
-    String blockingUsersIQExample = "<iq to='muclight.shakespeare.lit' id='block2' type='set'>"
+    private static final String blockingUsersIQExample = "<iq to='muclight.shakespeare.lit' id='block2' type='set'>"
             + "<query xmlns='urn:xmpp:muclight:0#blocking'>" + "<user action='deny'>hag77@shakespeare.lit</user>"
             + "<user action='deny'>hag66@shakespeare.lit</user>" + "</query>" + "</iq>";
 
-    String unblockingUsersAndRoomsExample = "<iq to='muclight.shakespeare.lit' id='unblock1' type='set'>"
+    private static final String unblockingUsersAndRoomsExample = "<iq to='muclight.shakespeare.lit' id='unblock1' type='set'>"
             + "<query xmlns='urn:xmpp:muclight:0#blocking'>"
             + "<room action='allow'>coven@muclight.shakespeare.lit</room>"
             + "<user action='allow'>hag66@shakespeare.lit</user>" + "</query>" + "</iq>";
@@ -66,7 +66,7 @@ public class MUCLightBlockingTest {
 
     @Test
     public void checkGetBlockingListResponse() throws Exception {
-        IQ iqInfoResult = (IQ) PacketParserUtils.parseStanza(getBlockingListIQResponse);
+        IQ iqInfoResult = PacketParserUtils.parseStanza(getBlockingListIQResponse);
         MUCLightBlockingIQ mucLightBlockingIQ = (MUCLightBlockingIQ) iqInfoResult;
 
         Assert.assertEquals(2, mucLightBlockingIQ.getRooms().size());
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightChangeAffiliationsIQTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightChangeAffiliationsIQTest.java
index 7180bf873..44a9e067d 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightChangeAffiliationsIQTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightChangeAffiliationsIQTest.java
@@ -29,7 +29,7 @@ import org.jxmpp.jid.impl.JidCreate;
 
 public class MUCLightChangeAffiliationsIQTest {
 
-    String stanza = "<iq " + "to='coven@muclight.shakespeare.lit' id='member1' type='set'>"
+    private static final String stanza = "<iq " + "to='coven@muclight.shakespeare.lit' id='member1' type='set'>"
             + "<query xmlns='urn:xmpp:muclight:0#affiliations'>"
             + "<user affiliation='owner'>sarasa2@shakespeare.lit</user>"
             + "<user affiliation='member'>sarasa1@shakespeare.lit</user>"
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightConfigurationsChangeExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightConfigurationsChangeExtensionTest.java
index e4002c221..0b95af0d3 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightConfigurationsChangeExtensionTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightConfigurationsChangeExtensionTest.java
@@ -26,23 +26,23 @@ import org.junit.Test;
 
 public class MUCLightConfigurationsChangeExtensionTest {
 
-    String messageWithSubjectChangeExample = "<message to='crone1@shakespeare.lit' from='coven@muclight.shakespeare.lit' id='newsubject' type='groupchat'>"
+    private static final String messageWithSubjectChangeExample = "<message to='crone1@shakespeare.lit' from='coven@muclight.shakespeare.lit' id='newsubject' type='groupchat'>"
             + "<body></body>" + "<x xmlns='urn:xmpp:muclight:0#configuration'>"
             + "<prev-version>asdfghj000</prev-version>" + "<version>asdfghj</version>"
             + "<subject>To be or not to be?</subject>" + "</x>" + "</message>";
 
-    String messageWithRoomNameChangeExample = "<message to='crone1@shakespeare.lit' from='coven@muclight.shakespeare.lit' id='newsubject' type='groupchat'>"
+    private static final String messageWithRoomNameChangeExample = "<message to='crone1@shakespeare.lit' from='coven@muclight.shakespeare.lit' id='newsubject' type='groupchat'>"
             + "<body></body>" + "<x xmlns='urn:xmpp:muclight:0#configuration'>" + "<prev-version>zaqwsx</prev-version>"
             + "<version>zxcvbnm</version>" + "<roomname>A Darker Cave</roomname>" + "</x>" + "</message>";
 
-    String messageWithConfigsChangeExample = "<message to='crone1@shakespeare.lit' from='coven@muclight.shakespeare.lit' id='newsubject' type='groupchat'>"
+    private static final String messageWithConfigsChangeExample = "<message to='crone1@shakespeare.lit' from='coven@muclight.shakespeare.lit' id='newsubject' type='groupchat'>"
             + "<body></body>" + "<x xmlns='urn:xmpp:muclight:0#configuration'>" + "<prev-version>zaqwsx</prev-version>"
             + "<version>zxcvbnm</version>" + "<roomname>A Darker Cave</roomname>" + "<color>blue</color>" + "</x>"
             + "</message>";
 
     @Test
     public void checkSubjectChangeExtension() throws Exception {
-        Message configurationsMessage = (Message) PacketParserUtils.parseStanza(messageWithSubjectChangeExample);
+        Message configurationsMessage = PacketParserUtils.parseStanza(messageWithSubjectChangeExample);
         ConfigurationsChangeExtension configurationsChangeExtension = ConfigurationsChangeExtension
                 .from(configurationsMessage);
 
@@ -56,7 +56,7 @@ public class MUCLightConfigurationsChangeExtensionTest {
 
     @Test
     public void checkRoomNameChangeExtension() throws Exception {
-        Message configurationsMessage = (Message) PacketParserUtils.parseStanza(messageWithRoomNameChangeExample);
+        Message configurationsMessage = PacketParserUtils.parseStanza(messageWithRoomNameChangeExample);
         ConfigurationsChangeExtension configurationsChangeExtension = ConfigurationsChangeExtension
                 .from(configurationsMessage);
 
@@ -70,7 +70,7 @@ public class MUCLightConfigurationsChangeExtensionTest {
 
     @Test
     public void checkConfigsChangeExtension() throws Exception {
-        Message configurationsMessage = (Message) PacketParserUtils.parseStanza(messageWithConfigsChangeExample);
+        Message configurationsMessage = PacketParserUtils.parseStanza(messageWithConfigsChangeExample);
         ConfigurationsChangeExtension configurationsChangeExtension = ConfigurationsChangeExtension
                 .from(configurationsMessage);
 
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightCreateIQTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightCreateIQTest.java
index 4a5ba7067..036d3ad7c 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightCreateIQTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightCreateIQTest.java
@@ -29,7 +29,7 @@ import org.jxmpp.jid.impl.JidCreate;
 
 public class MUCLightCreateIQTest {
 
-    String stanza = "<iq to='ef498f55-5f79-4238-a5ae-4efe19cbe617@muclight.test.com' id='1c72W-50' type='set'>"
+    private static final String stanza = "<iq to='ef498f55-5f79-4238-a5ae-4efe19cbe617@muclight.test.com' id='1c72W-50' type='set'>"
             + "<query xmlns='urn:xmpp:muclight:0#create'>" + "<configuration>" + "<roomname>test</roomname>"
             + "</configuration>" + "<occupants>" + "<user affiliation='member'>charlie@test.com</user>"
             + "<user affiliation='member'>pep@test.com</user>" + "</occupants>" + "</query>" + "</iq>";
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightDestroyTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightDestroyTest.java
index cafc9264b..b00c5a0d4 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightDestroyTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightDestroyTest.java
@@ -24,7 +24,7 @@ import org.jxmpp.jid.impl.JidCreate;
 
 public class MUCLightDestroyTest {
 
-    String stanza = "<iq to='coven@muclight.shakespeare.lit' id='destroy1' type='set'>"
+    private static final String stanza = "<iq to='coven@muclight.shakespeare.lit' id='destroy1' type='set'>"
             + "<query xmlns='urn:xmpp:muclight:0#destroy'/>" + "</iq>";
 
     @Test
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetAffiliationsTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetAffiliationsTest.java
index 95d9fc19b..679772ea3 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetAffiliationsTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetAffiliationsTest.java
@@ -31,10 +31,10 @@ import org.jxmpp.jid.impl.JidCreate;
 
 public class MUCLightGetAffiliationsTest {
 
-    String getAffiliationsIQExample = "<iq to='coven@muclight.shakespeare.lit' id='getmembers' type='get'>"
+    private static final String getAffiliationsIQExample = "<iq to='coven@muclight.shakespeare.lit' id='getmembers' type='get'>"
             + "<query xmlns='urn:xmpp:muclight:0#affiliations'>" + "<version>abcdefg</version>" + "</query>" + "</iq>";
 
-    String getAffiliationsResponseExample = "<iq from='coven@muclight.shakespeare.lit' id='getmembers' to='crone1@shakespeare.lit/desktop' type='result'>"
+    private static final String getAffiliationsResponseExample = "<iq from='coven@muclight.shakespeare.lit' id='getmembers' to='crone1@shakespeare.lit/desktop' type='result'>"
             + "<query xmlns='urn:xmpp:muclight:0#affiliations'>" + "<version>123456</version>"
             + "<user affiliation='owner'>user1@shakespeare.lit</user>"
             + "<user affiliation='member'>user2@shakespeare.lit</user>"
@@ -50,7 +50,7 @@ public class MUCLightGetAffiliationsTest {
 
     @Test
     public void checkGetAffiliationsResponse() throws Exception {
-        IQ iqInfoResult = (IQ) PacketParserUtils.parseStanza(getAffiliationsResponseExample);
+        IQ iqInfoResult = PacketParserUtils.parseStanza(getAffiliationsResponseExample);
         MUCLightAffiliationsIQ mucLightAffiliationsIQ = (MUCLightAffiliationsIQ) iqInfoResult;
 
         Assert.assertEquals("123456", mucLightAffiliationsIQ.getVersion());
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetConfigsTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetConfigsTest.java
index 1d92832b7..5b97c21c1 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetConfigsTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetConfigsTest.java
@@ -30,15 +30,15 @@ import org.jxmpp.jid.impl.JidCreate;
 
 public class MUCLightGetConfigsTest {
 
-    String getConfigsIQExample = "<iq to='coven@muclight.shakespeare.lit' id='config0' type='get'>"
+    private static final String getConfigsIQExample = "<iq to='coven@muclight.shakespeare.lit' id='config0' type='get'>"
             + "<query xmlns='urn:xmpp:muclight:0#configuration'>" + "<version>abcdefg</version>" + "</query>" + "</iq>";
 
-    String getConfigsResponseExample = "<iq from='coven@muclight.shakespeare.lit' id='getconfig1' "
+    private static final String getConfigsResponseExample = "<iq from='coven@muclight.shakespeare.lit' id='getconfig1' "
             + "to='crone1@shakespeare.lit/desktop' type='result'>" + "<query xmlns='urn:xmpp:muclight:0#configuration'>"
             + "<version>123456</version>" + "<roomname>A Dark Cave</roomname>" + "<subject>A subject</subject>"
             + "</query>" + "</iq>";
 
-    String getConfigsResponseExampleWithCustomConfigs = "<iq from='coven@muclight.shakespeare.lit' id='getconfig2' "
+    private static final String getConfigsResponseExampleWithCustomConfigs = "<iq from='coven@muclight.shakespeare.lit' id='getconfig2' "
             + "to='crone1@shakespeare.lit/desktop' type='result'>" + "<query xmlns='urn:xmpp:muclight:0#configuration'>"
             + "<version>123456</version>" + "<roomname>A Dark Cave</roomname>" + "<color>blue</color>"
             + "<size>20</size>" + "</query>" + "</iq>";
@@ -53,7 +53,7 @@ public class MUCLightGetConfigsTest {
 
     @Test
     public void checkGetConfigsResponse() throws Exception {
-        IQ iqInfoResult = (IQ) PacketParserUtils.parseStanza(getConfigsResponseExample);
+        IQ iqInfoResult = PacketParserUtils.parseStanza(getConfigsResponseExample);
         MUCLightConfigurationIQ mucLightConfigurationIQ = (MUCLightConfigurationIQ) iqInfoResult;
 
         Assert.assertEquals("123456", mucLightConfigurationIQ.getVersion());
@@ -64,7 +64,7 @@ public class MUCLightGetConfigsTest {
 
     @Test
     public void checkGetConfigsResponseWithCustomConfigs() throws Exception {
-        IQ iqInfoResult = (IQ) PacketParserUtils.parseStanza(getConfigsResponseExampleWithCustomConfigs);
+        IQ iqInfoResult = PacketParserUtils.parseStanza(getConfigsResponseExampleWithCustomConfigs);
         MUCLightConfigurationIQ mucLightConfigurationIQ = (MUCLightConfigurationIQ) iqInfoResult;
 
         Assert.assertEquals("123456", mucLightConfigurationIQ.getVersion());
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightInfoTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightInfoTest.java
index 64e798ab9..f29d1e11b 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightInfoTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightInfoTest.java
@@ -28,13 +28,13 @@ import org.jxmpp.jid.impl.JidCreate;
 
 public class MUCLightInfoTest {
 
-    String exampleWithVersion = "<iq to='coven@muclight.shakespeare.lit' id='getinfo1' type='get'>"
+    private static final String exampleWithVersion = "<iq to='coven@muclight.shakespeare.lit' id='getinfo1' type='get'>"
             + "<query xmlns='urn:xmpp:muclight:0#info'>" + "<version>abcdefg</version>" + "</query>" + "</iq>";
 
-    String exampleWithoutVersion = "<iq to='coven@muclight.shakespeare.lit' id='getinfo1' type='get'>"
+    private static final String exampleWithoutVersion = "<iq to='coven@muclight.shakespeare.lit' id='getinfo1' type='get'>"
             + "<query xmlns='urn:xmpp:muclight:0#info'>" + "</query>" + "</iq>";
 
-    String exampleInfoResult = "<iq from='coven@muclight.shakespeare.lit' to='cronel@shakespeare.lit/desktop' id='getinfo1' type='result'>"
+    private static final String exampleInfoResult = "<iq from='coven@muclight.shakespeare.lit' to='cronel@shakespeare.lit/desktop' id='getinfo1' type='result'>"
             + "<query xmlns='urn:xmpp:muclight:0#info'>" + "<version>123456</version>" + "<configuration>"
             + "<roomname>test</roomname>" + "</configuration>" + "<occupants>"
             + "<user affiliation='owner'>john@test.com</user>" + "<user affiliation='member'>charlie@test.com</user>"
@@ -58,7 +58,7 @@ public class MUCLightInfoTest {
 
     @Test
     public void checkMUCLightInfoResult() throws Exception {
-        IQ iqInfoResult = (IQ) PacketParserUtils.parseStanza(exampleInfoResult);
+        IQ iqInfoResult = PacketParserUtils.parseStanza(exampleInfoResult);
         MUCLightInfoIQ mucLightInfoResponseIQ = (MUCLightInfoIQ) iqInfoResult;
         Assert.assertEquals(mucLightInfoResponseIQ.getVersion(), "123456");
         Assert.assertEquals(mucLightInfoResponseIQ.getConfiguration().getRoomName(), "test");
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightSetConfigsIQTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightSetConfigsIQTest.java
index 17ea91522..69a66c755 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightSetConfigsIQTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightSetConfigsIQTest.java
@@ -26,15 +26,15 @@ import org.jxmpp.jid.impl.JidCreate;
 
 public class MUCLightSetConfigsIQTest {
 
-    String setConfigsIQExample = "<iq to='coven@muclight.shakespeare.lit' id='conf1' type='set'>"
+    private static final String setConfigsIQExample = "<iq to='coven@muclight.shakespeare.lit' id='conf1' type='set'>"
             + "<query xmlns='urn:xmpp:muclight:0#configuration'>" + "<roomname>A Darker Cave</roomname>"
             + "<color>blue</color>" + "</query>" + "</iq>";
 
-    String changeRoomNameIQExample = "<iq to='coven@muclight.shakespeare.lit' id='roomName1' type='set'>"
+    private static final String changeRoomNameIQExample = "<iq to='coven@muclight.shakespeare.lit' id='roomName1' type='set'>"
             + "<query xmlns='urn:xmpp:muclight:0#configuration'>" + "<roomname>A Darker Cave</roomname>" + "</query>"
             + "</iq>";
 
-    String changeSubjectIQExample = "<iq to='coven@muclight.shakespeare.lit' id='subject1' type='set'>"
+    private static final String changeSubjectIQExample = "<iq to='coven@muclight.shakespeare.lit' id='subject1' type='set'>"
             + "<query xmlns='urn:xmpp:muclight:0#configuration'>" + "<subject>To be or not to be?</subject>"
             + "</query>" + "</iq>";
 
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/DisablePushNotificationsIQTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/DisablePushNotificationsIQTest.java
index 0a607c806..76bd1de25 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/DisablePushNotificationsIQTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/DisablePushNotificationsIQTest.java
@@ -24,10 +24,10 @@ import org.jxmpp.jid.impl.JidCreate;
 
 public class DisablePushNotificationsIQTest {
 
-    String disableAllNotificationsIQExample = "<iq id='x97' type='set'>"
+    private static final String disableAllNotificationsIQExample = "<iq id='x97' type='set'>"
             + "<disable xmlns='urn:xmpp:push:0' jid='push-5.client.example'>" + "</disable>" + "</iq>";
 
-    String disableNodeNotificationsIQExample = "<iq id='x97' type='set'>"
+    private static final String disableNodeNotificationsIQExample = "<iq id='x97' type='set'>"
             + "<disable xmlns='urn:xmpp:push:0' jid='push-5.client.example' node='yxs32uqsflafdk3iuqo'>" + "</disable>"
             + "</iq>";
 
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/EnablePushNotificationsIQTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/EnablePushNotificationsIQTest.java
index c418d7cea..3b21ffe79 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/EnablePushNotificationsIQTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/EnablePushNotificationsIQTest.java
@@ -26,11 +26,11 @@ import org.jxmpp.jid.impl.JidCreate;
 
 public class EnablePushNotificationsIQTest {
 
-    String exampleEnableIQ = "<iq id='x42' type='set'>"
+    private static final String exampleEnableIQ = "<iq id='x42' type='set'>"
             + "<enable xmlns='urn:xmpp:push:0' jid='push-5.client.example' node='yxs32uqsflafdk3iuqo'>" + "</enable>"
             + "</iq>";
 
-    String exampleEnableIQWithPublishOptions = "<iq id='x42' type='set'>"
+    private static final String exampleEnableIQWithPublishOptions = "<iq id='x42' type='set'>"
             + "<enable xmlns='urn:xmpp:push:0' jid='push-5.client.example' node='yxs32uqsflafdk3iuqo'>"
             + "<x xmlns='jabber:x:data' type='submit'>"
             + "<field var='FORM_TYPE'><value>http://jabber.org/protocol/pubsub#publish-options</value></field>"
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/RemoteDisablingPushNotificationsTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/RemoteDisablingPushNotificationsTest.java
index 75f9cc177..96d3ee64d 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/RemoteDisablingPushNotificationsTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/RemoteDisablingPushNotificationsTest.java
@@ -27,24 +27,24 @@ import org.jxmpp.jid.impl.JidCreate;
 
 public class RemoteDisablingPushNotificationsTest {
 
-    String remoteDisablingExample = "<message from='push-5.client.example' to='user@example.com'>"
+    private static final String remoteDisablingExample = "<message from='push-5.client.example' to='user@example.com'>"
             + "<pubsub xmlns='http://jabber.org/protocol/pubsub' node='yxs32uqsflafdk3iuqo'>"
             + "<affiliation jid='user@example.com' affiliation='none' />" + "</pubsub>" + "</message>";
 
-    String wrongRemoteDisabling1 = "<message from='push-5.client.example' to='user@example.com'>"
+    private static final String wrongRemoteDisabling1 = "<message from='push-5.client.example' to='user@example.com'>"
             + "<pubsub xmlns='http://jabber.org/protocol/pubsub' node='yxs32uqsflafdk3iuqo'>"
             + "<affiliation jid='user@example.com'/>" + "</pubsub>" + "</message>";
 
-    String wrongRemoteDisabling2 = "<message from='push-5.client.example' to='user@example.com'>"
+    private static final String wrongRemoteDisabling2 = "<message from='push-5.client.example' to='user@example.com'>"
             + "<pubsub xmlns='http://jabber.org/protocol/pubsub' node='yxs32uqsflafdk3iuqo'>"
             + "<affiliation jid='user@example.com' affiliation='member' />" + "</pubsub>" + "</message>";
 
-    String wrongRemoteDisabling3 = "<message from='push-5.client.example' to='user@example.com'>"
+    private static final String wrongRemoteDisabling3 = "<message from='push-5.client.example' to='user@example.com'>"
             + "<pubsub xmlns='http://jabber.org/protocol/pubsub'>" + "</pubsub>" + "</message>";
 
     @Test
     public void checkRemoteDisablingPushNotificationsParse() throws Exception {
-        Message message = (Message) PacketParserUtils.parseStanza(remoteDisablingExample);
+        Message message = PacketParserUtils.parseStanza(remoteDisablingExample);
         RemoteDisablingExtension remoteDisablingExtension = RemoteDisablingExtension.from(message);
 
         Assert.assertEquals("yxs32uqsflafdk3iuqo", remoteDisablingExtension.getNode());
@@ -53,15 +53,15 @@ public class RemoteDisablingPushNotificationsTest {
 
     @Test
     public void checkWrongRemoteDisablighPushNotifications() throws Exception {
-        Message message1 = (Message) PacketParserUtils.parseStanza(wrongRemoteDisabling1);
+        Message message1 = PacketParserUtils.parseStanza(wrongRemoteDisabling1);
         RemoteDisablingExtension remoteDisablingExtension1 = RemoteDisablingExtension.from(message1);
         Assert.assertNull(remoteDisablingExtension1);
 
-        Message message2 = (Message) PacketParserUtils.parseStanza(wrongRemoteDisabling1);
+        Message message2 = PacketParserUtils.parseStanza(wrongRemoteDisabling1);
         RemoteDisablingExtension remoteDisablingExtension2 = RemoteDisablingExtension.from(message2);
         Assert.assertNull(remoteDisablingExtension2);
 
-        Message message3 = (Message) PacketParserUtils.parseStanza(wrongRemoteDisabling1);
+        Message message3 = PacketParserUtils.parseStanza(wrongRemoteDisabling1);
         RemoteDisablingExtension remoteDisablingExtension3 = RemoteDisablingExtension.from(message3);
         Assert.assertNull(remoteDisablingExtension3);
     }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java
index 9dd6e0189..b91e10731 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java
@@ -112,7 +112,7 @@ public class MultipleRecipientManager {
             connection.sendStanza(packet);
             return;
         }
-        DomainBareJid serviceAddress = getMultipleRecipienServiceAddress(connection);
+        DomainBareJid serviceAddress = getMultipleRecipientServiceAddress(connection);
         if (serviceAddress != null) {
             // Send packet to target users using multiple recipient service provided by the server
             sendThroughService(connection, packet, to, cc, bcc, replyTo, replyRoom, noReply,
@@ -133,8 +133,8 @@ public class MultipleRecipientManager {
 
     /**
      * Sends a reply to a previously received stanza(/packet) that was sent to multiple recipients. Before
-     * attempting to send the reply message some checkings are performed. If any of those checkings
-     * fail then an XMPPException is going to be thrown with the specific error detail.
+     * attempting to send the reply message some checks are performed. If any of those checks
+     * fails, then an XMPPException is going to be thrown with the specific error detail.
      *
      * @param connection the connection to use to send the reply.
      * @param original   the previously received stanza(/packet) that was sent to multiple recipients.
@@ -201,8 +201,7 @@ public class MultipleRecipientManager {
      *         if none was found.
      */
     public static MultipleRecipientInfo getMultipleRecipientInfo(Stanza packet) {
-        MultipleAddresses extension = (MultipleAddresses) packet
-                .getExtension(MultipleAddresses.ELEMENT, MultipleAddresses.NAMESPACE);
+        MultipleAddresses extension = packet.getExtension(MultipleAddresses.ELEMENT, MultipleAddresses.NAMESPACE);
         return extension == null ? null : new MultipleRecipientInfo(extension);
     }
 
@@ -283,7 +282,7 @@ public class MultipleRecipientManager {
      * @throws NotConnectedException 
      * @throws InterruptedException 
      */
-    private static DomainBareJid getMultipleRecipienServiceAddress(XMPPConnection connection) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
+    private static DomainBareJid getMultipleRecipientServiceAddress(XMPPConnection connection) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
         ServiceDiscoveryManager sdm = ServiceDiscoveryManager.getInstanceFor(connection);
         return sdm.findService(MultipleAddresses.NAMESPACE, true);
     }
@@ -296,7 +295,7 @@ public class MultipleRecipientManager {
      */
     private static class PacketCopy extends Stanza {
 
-        private CharSequence text;
+        private final CharSequence text;
 
         /**
          * Create a copy of a stanza(/packet) with the text to send. The passed text must be a valid text to
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java
index 373daba9e..ab1f5c6de 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java
@@ -53,7 +53,7 @@ public class MultipleAddresses implements ExtensionElement {
         ofrom,
     }
 
-    private List<Address> addresses = new ArrayList<Address>();
+    private final List<Address> addresses = new ArrayList<>();
 
     /**
      * Adds a new address to which the stanza(/packet) is going to be sent or was sent.
@@ -68,7 +68,7 @@ public class MultipleAddresses implements ExtensionElement {
      */
     public void addAddress(Type type, Jid jid, String node, String desc, boolean delivered,
             String uri) {
-        // Create a new address with the specificed configuration
+        // Create a new address with the specified configuration
         Address address = new Address(type);
         address.setJid(jid);
         address.setNode(node);
@@ -83,7 +83,7 @@ public class MultipleAddresses implements ExtensionElement {
      * Indicate that the stanza(/packet) being sent should not be replied.
      */
     public void setNoReply() {
-        // Create a new address with the specificed configuration
+        // Create a new address with the specified configuration
         Address address = new Address(Type.noreply);
         // Add the new address to the list of multiple recipients
         addresses.add(address);
@@ -97,7 +97,7 @@ public class MultipleAddresses implements ExtensionElement {
      * @return the list of addresses that matches the specified type.
      */
     public List<Address> getAddressesOfType(Type type) {
-        List<Address> answer = new ArrayList<Address>(addresses.size());
+        List<Address> answer = new ArrayList<>(addresses.size());
         for (Address address : addresses) {
             if (address.getType().equals(type)) {
                 answer.add(address);
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPDeliverCondition.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPDeliverCondition.java
index 84d15860c..46acf6a1f 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPDeliverCondition.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPDeliverCondition.java
@@ -43,7 +43,7 @@ public class AMPDeliverCondition implements AMPExtension.Condition {
     private final Value value;
 
     /**
-     * Create new amp deliver condition with value setted to one of defined by XEP-0079.
+     * Create new amp deliver condition with value set to one of defined by XEP-0079.
      * See http://xmpp.org/extensions/xep-0079.html#conditions-def-deliver
      * @param value AMPDeliveryCondition.Value instance that will be used as value parameter. Can't be null.
      */
@@ -67,7 +67,7 @@ public class AMPDeliverCondition implements AMPExtension.Condition {
      * Value for amp deliver condition as defined by XEP-0079.
      * See http://xmpp.org/extensions/xep-0079.html#conditions-def-deliver
      */
-    public static enum Value {
+    public enum Value {
         /**
          * The message would be immediately delivered to the intended recipient or routed to the next hop.
          */
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPExpireAtCondition.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPExpireAtCondition.java
index 8779c2820..53fc409a3 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPExpireAtCondition.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPExpireAtCondition.java
@@ -48,7 +48,7 @@ public class AMPExpireAtCondition implements AMPExtension.Condition {
     private final String value;
 
     /**
-     * Create new expire-at amp condition with value setted as XEP-0082 formatted date.
+     * Create new expire-at amp condition with value set as XEP-0082 formatted date.
      * @param utcDateTime Date instance of time
      *                    that will be used as value parameter after formatting to XEP-0082 format. Can't be null.
      */
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPMatchResourceCondition.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPMatchResourceCondition.java
index 0445359f3..2bae2ad87 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPMatchResourceCondition.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPMatchResourceCondition.java
@@ -43,7 +43,7 @@ public class AMPMatchResourceCondition implements AMPExtension.Condition {
     private final Value value;
 
     /**
-     * Create new amp match-resource condition with value setted to one of defined by XEP-0079.
+     * Create new amp match-resource condition with value set to one of defined by XEP-0079.
      * See http://xmpp.org/extensions/xep-0079.html#conditions-def-match
      * @param value AMPDeliveryCondition.Value instance that will be used as value parameter. Can't be null.
      */
@@ -67,7 +67,7 @@ public class AMPMatchResourceCondition implements AMPExtension.Condition {
      * match-resource amp condition value as defined by XEP-0079.
      * See http://xmpp.org/extensions/xep-0079.html#conditions-def-match
      */
-    public static enum Value {
+    public enum Value {
         /**
          * Destination resource matches any value, effectively ignoring the intended resource.
          * Example: "home/laptop" matches "home", "home/desktop" or "work/desktop"
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/packet/AMPExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/packet/AMPExtension.java
index 6d842e04f..c8b696cc3 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/packet/AMPExtension.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/packet/AMPExtension.java
@@ -31,7 +31,7 @@ public class AMPExtension implements ExtensionElement {
     public static final String NAMESPACE = "http://jabber.org/protocol/amp";
     public static final String ELEMENT = "amp";
 
-    private CopyOnWriteArrayList<Rule> rules = new CopyOnWriteArrayList<Rule>();
+    private final CopyOnWriteArrayList<Rule> rules = new CopyOnWriteArrayList<>();
     private boolean perHop = false;
 
     private final String from;
@@ -225,18 +225,18 @@ public class AMPExtension implements ExtensionElement {
      * @see AMPExpireAtCondition
      * @see AMPMatchResourceCondition
      **/
-    public static interface Condition {
+    public interface Condition {
         String getName();
         String getValue();
 
-        static final String ATTRIBUTE_NAME = "condition";
+        String ATTRIBUTE_NAME = "condition";
     }
 
     /**
      * amp action attribute.
      * See http://xmpp.org/extensions/xep-0079.html#actions-def
      **/
-    public static enum Action {
+    public enum Action {
         /**
          * The "alert" action triggers a reply <message/> stanza to the sending entity.
          * This <message/> stanza MUST contain the element <amp status='alert'/>,
@@ -272,7 +272,7 @@ public class AMPExtension implements ExtensionElement {
     /**
      * amp notification status as defined by XEP-0079.
      */
-    public static enum Status {
+    public enum Status {
         alert,
         error,
         notify
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/BlockingCommandManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/BlockingCommandManager.java
index 4be9dce33..a5347c311 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/BlockingCommandManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/BlockingCommandManager.java
@@ -103,7 +103,7 @@ public final class BlockingCommandManager extends Manager {
                         BlockContactsIQ blockContactIQ = (BlockContactsIQ) iqRequest;
 
                         if (blockListCached == null) {
-                            blockListCached = new ArrayList<Jid>();
+                            blockListCached = new ArrayList<>();
                         }
 
                         List<Jid> blockedJids = blockContactIQ.getJids();
@@ -125,7 +125,7 @@ public final class BlockingCommandManager extends Manager {
                 UnblockContactsIQ unblockContactIQ = (UnblockContactsIQ) iqRequest;
 
                 if (blockListCached == null) {
-                    blockListCached = new ArrayList<Jid>();
+                    blockListCached = new ArrayList<>();
                 }
 
                 List<Jid> unblockedJids = unblockContactIQ.getJids();
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkManager.java
index 6346683c6..45ed9ab2b 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkManager.java
@@ -45,7 +45,7 @@ import org.jxmpp.jid.parts.Resourcepart;
  * @author Alexander Wenckus
  */
 public final class BookmarkManager {
-    private static final Map<XMPPConnection, BookmarkManager> bookmarkManagerMap = new WeakHashMap<XMPPConnection, BookmarkManager>();
+    private static final Map<XMPPConnection, BookmarkManager> bookmarkManagerMap = new WeakHashMap<>();
 
     static {
         PrivateDataManager.addPrivateDataProvider("storage", "storage:bookmarks",
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedConference.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedConference.java
index 9037f01aa..555af7e2c 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedConference.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedConference.java
@@ -21,7 +21,7 @@ import org.jxmpp.jid.EntityBareJid;
 import org.jxmpp.jid.parts.Resourcepart;
 
 /**
- * Respresents a Conference Room bookmarked on the server using XEP-0048 Bookmark Storage XEP.
+ * Represents a Conference Room bookmarked on the server using XEP-0048 Bookmark Storage XEP.
  *
  * @author Derek DeMoro
  */
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedURL.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedURL.java
index a0e438bb5..1f8f14318 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedURL.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedURL.java
@@ -18,7 +18,7 @@
 package org.jivesoftware.smackx.bookmarks;
 
 /**
- * Respresents one instance of a URL defined using XEP-0048 Bookmark Storage XEP.
+ * Represents one instance of a URL defined using XEP-0048 Bookmark Storage XEP.
  *
  * @author Derek DeMoro
  */
@@ -41,9 +41,9 @@ public class BookmarkedURL implements SharedBookmark {
 
     /**
      * Returns the name representing the URL (eg. Jive Software). This can be used in as a label, or
-     * identifer in applications.
+     * identifier in applications.
      *
-     * @return the name reprenting the URL.
+     * @return the name representing the URL.
      */
     public String getName() {
         return name;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java
index f046be1b7..e3937f957 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java
@@ -68,15 +68,15 @@ public class Bookmarks implements PrivateData {
     public static final String NAMESPACE = "storage:bookmarks";
     public static final String ELEMENT = "storage";
 
-    private List<BookmarkedURL> bookmarkedURLS;
-    private List<BookmarkedConference> bookmarkedConferences;
+    private final List<BookmarkedURL> bookmarkedURLS;
+    private final List<BookmarkedConference> bookmarkedConferences;
 
     /**
      * Required Empty Constructor to use Bookmarks.
      */
     public Bookmarks() {
-        bookmarkedURLS = new ArrayList<BookmarkedURL>();
-        bookmarkedConferences = new ArrayList<BookmarkedConference>();
+        bookmarkedURLS = new ArrayList<>();
+        bookmarkedConferences = new ArrayList<>();
     }
 
     /**
@@ -280,7 +280,7 @@ public class Bookmarks implements PrivateData {
 
         BookmarkedConference conf = new BookmarkedConference(jid);
         conf.setName(name);
-        conf.setAutoJoin(Boolean.valueOf(autojoin).booleanValue());
+        conf.setAutoJoin(Boolean.valueOf(autojoin));
 
         // Check for nickname
         boolean done = false;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/SharedBookmark.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/SharedBookmark.java
index 45d77ba60..d618f8ad1 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/SharedBookmark.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/SharedBookmark.java
@@ -29,5 +29,5 @@ public interface SharedBookmark {
      *
      * @return returns true if this bookmark is shared.
      */
-    public boolean isShared();
+    boolean isShared();
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamListener.java
index b5c13ff8e..13d3169dd 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamListener.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamListener.java
@@ -45,6 +45,6 @@ public interface BytestreamListener {
      * 
      * @param request the incoming bytestream request
      */
-    public void incomingBytestreamRequest(BytestreamRequest request);
+    void incomingBytestreamRequest(BytestreamRequest request);
 
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java
index 3edada382..d4b8cba36 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java
@@ -41,14 +41,14 @@ public interface BytestreamRequest {
      * 
      * @return the sender of the bytestream open request
      */
-    public Jid getFrom();
+    Jid getFrom();
 
     /**
      * Returns the session ID of the bytestream open request.
      * 
      * @return the session ID of the bytestream open request
      */
-    public String getSessionID();
+    String getSessionID();
 
     /**
      * Accepts the bytestream open request and returns the session to send/receive data.
@@ -60,13 +60,13 @@ public interface BytestreamRequest {
      * @throws NoResponseException 
      * @throws SmackException 
      */
-    public BytestreamSession accept() throws InterruptedException, NoResponseException, XMPPErrorException, SmackException;
+    BytestreamSession accept() throws InterruptedException, XMPPErrorException, SmackException;
 
     /**
      * Rejects the bytestream request by sending a reject error to the initiator.
      * @throws NotConnectedException 
      * @throws InterruptedException 
      */
-    public void reject() throws NotConnectedException, InterruptedException;
+    void reject() throws NotConnectedException, InterruptedException;
 
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamSession.java
index 4e57d257d..b38357021 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamSession.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamSession.java
@@ -39,7 +39,7 @@ public interface BytestreamSession {
      * @return the InputStream associated with this session to send data
      * @throws IOException if an error occurs while retrieving the input stream
      */
-    public InputStream getInputStream() throws IOException;
+    InputStream getInputStream() throws IOException;
 
     /**
      * Returns the OutputStream associated with this session to receive data.
@@ -47,7 +47,7 @@ public interface BytestreamSession {
      * @return the OutputStream associated with this session to receive data
      * @throws IOException if an error occurs while retrieving the output stream
      */
-    public OutputStream getOutputStream() throws IOException;
+    OutputStream getOutputStream() throws IOException;
 
     /**
      * Closes the bytestream session.
@@ -57,7 +57,7 @@ public interface BytestreamSession {
      * 
      * @throws IOException if an error occurs while closing the session
      */
-    public void close() throws IOException;
+    void close() throws IOException;
 
     /**
      * Returns the timeout for read operations of the input stream associated with this session. 0
@@ -66,7 +66,7 @@ public interface BytestreamSession {
      * @return the timeout for read operations
      * @throws IOException if there is an error in the underlying protocol
      */
-    public int getReadTimeout() throws IOException;
+    int getReadTimeout() throws IOException;
 
     /**
      * Sets the specified timeout, in milliseconds. With this option set to a non-zero timeout, a
@@ -79,6 +79,6 @@ public interface BytestreamSession {
      * @param timeout the specified timeout, in milliseconds
      * @throws IOException if there is an error in the underlying protocol
      */
-    public void setReadTimeout(int timeout) throws IOException;
+    void setReadTimeout(int timeout) throws IOException;
 
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
index f9bcf6969..743caabd9 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
@@ -181,7 +181,7 @@ public final class InBandBytestreamManager extends Manager implements Bytestream
      * list containing session IDs of In-Band Bytestream open packets that should be ignored by the
      * InitiationListener
      */
-    private List<String> ignoredBytestreamRequests = Collections.synchronizedList(new LinkedList<String>());
+    private final List<String> ignoredBytestreamRequests = Collections.synchronizedList(new LinkedList<String>());
 
     /**
      * Returns the InBandBytestreamManager to handle In-Band Bytestreams for a given
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
index 79a5b29e8..3b925e91a 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
@@ -532,7 +532,7 @@ public class InBandBytestreamSession implements BytestreamSession {
                 @Override
                 public void processStanza(Stanza packet) {
                     // get data packet extension
-                    DataPacketExtension data = (DataPacketExtension) packet.getExtension(
+                    DataPacketExtension data = packet.getExtension(
                                     DataPacketExtension.ELEMENT,
                                     DataPacketExtension.NAMESPACE);
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java
index 124652b4e..fb0c9dd43 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java
@@ -40,8 +40,7 @@ public class DataPacketProvider {
         public Data parse(XmlPullParser parser, int initialDepth)
                         throws Exception {
             DataPacketExtension data = packetExtensionProvider.parse(parser);
-            Data iq = new Data(data);
-            return iq;
+            return new Data(data);
         }
     }
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java
index 1b68bd70c..53c9e9864 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java
@@ -40,7 +40,7 @@ public class OpenIQProvider extends IQProvider<Open> {
         int blockSize = Integer.parseInt(parser.getAttributeValue("", "block-size"));
 
         String stanzaValue = parser.getAttributeValue("", "stanza");
-        StanzaType stanza = null;
+        StanzaType stanza;
         if (stanzaValue == null) {
             stanza = StanzaType.IQ;
         }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
index 38c0a6261..25cd936df 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
@@ -152,7 +152,7 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
      * list containing session IDs of SOCKS5 Bytestream initialization packets that should be
      * ignored by the InitiationListener
      */
-    private List<String> ignoredBytestreamRequests = Collections.synchronizedList(new LinkedList<String>());
+    private final List<String> ignoredBytestreamRequests = Collections.synchronizedList(new LinkedList<String>());
 
     /**
      * Returns the Socks5BytestreamManager to handle SOCKS5 Bytestreams for a given
@@ -411,13 +411,12 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
      * @return the Socket to send/receive data to/from the user
      * @throws IOException if the bytestream could not be established
      * @throws InterruptedException if the current thread was interrupted while waiting
-     * @throws NoResponseException 
      * @throws SmackException if the target does not support SOCKS5.
      * @throws XMPPException 
      */
     @Override
     public Socks5BytestreamSession establishSession(Jid targetJID, String sessionID)
-                    throws IOException, InterruptedException, NoResponseException, SmackException, XMPPException {
+                    throws IOException, InterruptedException, SmackException, XMPPException {
         XMPPConnection connection = connection();
         XMPPErrorException discoveryException = null;
         // check if target supports SOCKS5 Bytestream
@@ -589,7 +588,7 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
      */
     private List<StreamHost> determineStreamHostInfos(List<Jid> proxies) {
         XMPPConnection connection = connection();
-        List<StreamHost> streamHosts = new ArrayList<StreamHost>();
+        List<StreamHost> streamHosts = new ArrayList<>();
 
         // add local proxy on first position if exists
         List<StreamHost> localProxies = getLocalStreamHost();
@@ -601,7 +600,7 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
         for (Jid proxy : proxies) {
             Bytestream streamHostRequest = createStreamHostRequest(proxy);
             try {
-                Bytestream response = (Bytestream) connection.createStanzaCollectorAndSend(
+                Bytestream response = connection.createStanzaCollectorAndSend(
                                 streamHostRequest).nextResultOrThrow();
                 streamHosts.addAll(response.getStreamHosts());
             }
@@ -650,7 +649,7 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
         }
         final int port = socks5Server.getPort();
 
-        List<StreamHost> streamHosts = new ArrayList<StreamHost>();
+        List<StreamHost> streamHosts = new ArrayList<>();
         outerloop: for (String address : addresses) {
             // Prevent loopback addresses from appearing as streamhost
             final String[] loopbackAddresses = { "127.0.0.1", "0:0:0:0:0:0:0:1", "::1" };
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java
index 1c7b43670..1d3b89fdc 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java
@@ -34,9 +34,7 @@ import java.util.logging.Logger;
 
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.XMPPException;
-import org.jivesoftware.smack.XMPPException.XMPPErrorException;
 import org.jivesoftware.smack.util.StringUtils;
-
 import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost;
 
 /**
@@ -74,16 +72,15 @@ class Socks5Client {
      * @param timeout timeout to connect to SOCKS5 proxy in milliseconds
      * @return socket the initialized socket
      * @throws IOException if initializing the socket failed due to a network error
-     * @throws XMPPErrorException if establishing connection to SOCKS5 proxy failed
      * @throws TimeoutException if connecting to SOCKS5 proxy timed out
      * @throws InterruptedException if the current thread was interrupted while waiting
-     * @throws SmackException if the connection to the SOC
+     * @throws SmackException if the connection to the SOCKS5 proxy failed
      * @throws XMPPException 
      */
-    public Socket getSocket(int timeout) throws IOException, XMPPErrorException, InterruptedException,
+    public Socket getSocket(int timeout) throws IOException, InterruptedException,
                     TimeoutException, SmackException, XMPPException {
         // wrap connecting in future for timeout
-        FutureTask<Socket> futureTask = new FutureTask<Socket>(new Callable<Socket>() {
+        FutureTask<Socket> futureTask = new FutureTask<>(new Callable<Socket>() {
 
             @Override
             public Socket call() throws IOException, SmackException {
@@ -173,7 +170,7 @@ class Socks5Client {
 
         // check if server responded with correct version and no-authentication method
         if (response[0] != (byte) 0x05 || response[1] != (byte) 0x00) {
-            throw new SmackException("Remote SOCKS5 server responsed with unexpected version: " + response[0] + ' ' + response[1] + ". Should be 0x05 0x00.");
+            throw new SmackException("Remote SOCKS5 server responded with unexpected version: " + response[0] + ' ' + response[1] + ". Should be 0x05 0x00.");
         }
 
         // request SOCKS5 connection with given address/digest
@@ -188,7 +185,7 @@ class Socks5Client {
         connectionRequest[1] = (byte) 0x00; // set expected return status to 0
         if (!Arrays.equals(connectionRequest, connectionResponse)) {
             throw new SmackException(
-                            "Connection request does not equal connection reponse. Response: "
+                            "Connection request does not equal connection response. Response: "
                                             + Arrays.toString(connectionResponse) + ". Request: "
                                             + Arrays.toString(connectionRequest));
         }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
index 53d744776..447b3750e 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
@@ -74,7 +74,7 @@ class Socks5ClientForInitiator extends Socks5Client {
     @Override
     public Socket getSocket(int timeout) throws IOException, InterruptedException,
                     TimeoutException, XMPPException, SmackException {
-        Socket socket = null;
+        Socket socket;
 
         // check if stream host is the local SOCKS5 proxy
         if (this.streamHost.getJID().equals(this.connection.get().getUser())) {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java
index 6f1b4bc3b..0a0046af4 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java
@@ -93,12 +93,12 @@ public final class Socks5Proxy {
     private ServerSocket serverSocket;
 
     /* assigns a connection to a digest */
-    private final Map<String, Socket> connectionMap = new ConcurrentHashMap<String, Socket>();
+    private final Map<String, Socket> connectionMap = new ConcurrentHashMap<>();
 
     /* list of digests connections should be stored */
     private final List<String> allowedConnections = Collections.synchronizedList(new LinkedList<String>());
 
-    private final Set<String> localAddresses = new LinkedHashSet<String>(4);
+    private final Set<String> localAddresses = new LinkedHashSet<>(4);
 
     /**
      * Private constructor.
@@ -112,7 +112,7 @@ public final class Socks5Proxy {
         } catch (SocketException e) {
             throw new IllegalStateException(e);
         }
-        Set<String> localHostAddresses = new HashSet<String>();
+        Set<String> localHostAddresses = new HashSet<>();
         for (NetworkInterface networkInterface : Collections.list(networkInterfaces)) {
             // We can't use NetworkInterface.getInterfaceAddresses here, which
             // would return a List instead the deprecated Enumeration, because
@@ -293,7 +293,7 @@ public final class Socks5Proxy {
      */
     public List<String> getLocalAddresses() {
         synchronized (localAddresses) {
-            return new LinkedList<String>(localAddresses);
+            return new LinkedList<>(localAddresses);
         }
     }
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java
index 8b022d9fc..a5d0ed7f1 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java
@@ -46,7 +46,7 @@ public class Bytestream extends IQ {
 
     private Mode mode = Mode.tcp;
 
-    private final List<StreamHost> streamHosts = new ArrayList<StreamHost>();
+    private final List<StreamHost> streamHosts = new ArrayList<>();
 
     private StreamHostUsed usedHost;
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java
index b28eb5ff4..fb862591b 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java
@@ -96,7 +96,7 @@ public final class EntityCapsManager extends Manager {
 
     private static boolean autoEnableEntityCaps = true;
 
-    private static Map<XMPPConnection, EntityCapsManager> instances = new WeakHashMap<>();
+    private static final Map<XMPPConnection, EntityCapsManager> instances = new WeakHashMap<>();
 
     private static final StanzaFilter PRESENCES_WITH_CAPS = new AndFilter(new StanzaTypeFilter(Presence.class), new StanzaExtensionFilter(
                     ELEMENT, NAMESPACE));
@@ -104,7 +104,7 @@ public final class EntityCapsManager extends Manager {
     /**
      * Map of "node + '#' + hash" to DiscoverInfo data
      */
-    static final LruCache<String, DiscoverInfo> CAPS_CACHE = new LruCache<String, DiscoverInfo>(1000);
+    static final LruCache<String, DiscoverInfo> CAPS_CACHE = new LruCache<>(1000);
 
     /**
      * Map of Full JID -&gt; DiscoverInfo/null. In case of c2s connection the
@@ -417,8 +417,8 @@ public final class EntityCapsManager extends Manager {
     }
 
     /**
-     * Get our own caps version. The version depends on the enabled features. A
-     * caps version looks like '66/0NaeaBKkwk85efJTGmU47vXI='
+     * Get our own caps version. The version depends on the enabled features.
+     * A caps version looks like '66/0NaeaBKkwk85efJTGmU47vXI='
      * 
      * @return our own caps version
      */
@@ -497,7 +497,7 @@ public final class EntityCapsManager extends Manager {
         if (connection != null)
             JID_TO_NODEVER_CACHE.put(connection.getUser(), new NodeVerHash(entityNode, currentCapsVersion));
 
-        final List<Identity> identities = new LinkedList<Identity>(ServiceDiscoveryManager.getInstanceFor(connection).getIdentities());
+        final List<Identity> identities = new LinkedList<>(ServiceDiscoveryManager.getInstanceFor(connection).getIdentities());
         sdm.setNodeInformationProvider(localNodeVer, new AbstractNodeInformationProvider() {
             List<String> features = sdm.getFeatures();
             List<ExtensionElement> packetExtensions = sdm.getExtendedInfoAsList();
@@ -531,7 +531,7 @@ public final class EntityCapsManager extends Manager {
     }
 
     /**
-     * Verify DisoverInfo and Caps Node as defined in XEP-0115 5.4 Processing
+     * Verify DiscoverInfo and Caps Node as defined in XEP-0115 5.4 Processing
      * Method.
      * 
      * @see <a href="http://xmpp.org/extensions/xep-0115.html#ver-proc">XEP-0115
@@ -569,7 +569,7 @@ public final class EntityCapsManager extends Manager {
      * @return true if the stanza(/packet) extensions is ill-formed
      */
     protected static boolean verifyPacketExtensions(DiscoverInfo info) {
-        List<FormField> foundFormTypes = new LinkedList<FormField>();
+        List<FormField> foundFormTypes = new LinkedList<>();
         for (ExtensionElement pe : info.getExtensions()) {
             if (pe.getNamespace().equals(DataForm.NAMESPACE)) {
                 DataForm df = (DataForm) pe;
@@ -628,10 +628,9 @@ public final class EntityCapsManager extends Manager {
         // [NAME]. Note that each slash is included even if the LANG or
         // NAME is not included (in accordance with XEP-0030, the category and
         // type MUST be included.
-        SortedSet<DiscoverInfo.Identity> sortedIdentities = new TreeSet<DiscoverInfo.Identity>();
+        SortedSet<DiscoverInfo.Identity> sortedIdentities = new TreeSet<>();
 
-        for (DiscoverInfo.Identity i : discoverInfo.getIdentities())
-            sortedIdentities.add(i);
+        sortedIdentities.addAll(discoverInfo.getIdentities());
 
         // 3. For each identity, append the 'category/type/lang/name' to S,
         // followed by the '<' character.
@@ -647,7 +646,7 @@ public final class EntityCapsManager extends Manager {
         }
 
         // 4. Sort the supported service discovery features.
-        SortedSet<String> features = new TreeSet<String>();
+        SortedSet<String> features = new TreeSet<>();
         for (Feature f : discoverInfo.getFeatures())
             features.add(f.getVar());
 
@@ -666,7 +665,7 @@ public final class EntityCapsManager extends Manager {
                 // 6. If the service discovery information response includes
                 // XEP-0128 data forms, sort the forms by the FORM_TYPE (i.e.,
                 // by the XML character data of the <value/> element).
-                SortedSet<FormField> fs = new TreeSet<FormField>(new Comparator<FormField>() {
+                SortedSet<FormField> fs = new TreeSet<>(new Comparator<FormField>() {
                     @Override
                     public int compare(FormField f1, FormField f2) {
                         return f1.getVariable().compareTo(f2.getVariable());
@@ -727,10 +726,8 @@ public final class EntityCapsManager extends Manager {
     }
 
     private static void formFieldValuesToCaps(List<String> i, StringBuilder sb) {
-        SortedSet<String> fvs = new TreeSet<String>();
-        for (String s : i) {
-            fvs.add(s);
-        }
+        SortedSet<String> fvs = new TreeSet<>();
+        fvs.addAll(i);
         for (String fv : fvs) {
             sb.append(fv);
             sb.append('<');
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java
index 4c555dae5..c6a7b1abb 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java
@@ -42,8 +42,8 @@ import org.jivesoftware.smackx.disco.packet.DiscoverInfo;
 public class SimpleDirectoryPersistentCache implements EntityCapsPersistentCache {
     private static final Logger LOGGER = Logger.getLogger(SimpleDirectoryPersistentCache.class.getName());
 
-    private File cacheDir;
-    private StringEncoder filenameEncoder;
+    private final File cacheDir;
+    private final StringEncoder filenameEncoder;
 
     /**
      * Creates a new SimpleDirectoryPersistentCache Object. Make sure that the
@@ -108,13 +108,15 @@ public class SimpleDirectoryPersistentCache implements EntityCapsPersistentCache
 
     private File getFileFor(String nodeVer) {
         String filename = filenameEncoder.encode(nodeVer);
-        File nodeFile = new File(cacheDir, filename);
-        return nodeFile;
+        return new File(cacheDir, filename);
     }
 
     @Override
     public void emptyCache() {
         File[] files = cacheDir.listFiles();
+        if (files == null) {
+            return;
+        }
         for (File f : files) {
             f.delete();
         }
@@ -145,7 +147,7 @@ public class SimpleDirectoryPersistentCache implements EntityCapsPersistentCache
      */
     private static DiscoverInfo restoreInfoFromFile(File file) throws Exception {
         DataInputStream dis = new DataInputStream(new FileInputStream(file));
-        String fileContent = null;
+        String fileContent;
         try {
             fileContent = dis.readUTF();
         } finally {
@@ -154,8 +156,6 @@ public class SimpleDirectoryPersistentCache implements EntityCapsPersistentCache
         if (fileContent == null) {
             return null;
         }
-        DiscoverInfo info = (DiscoverInfo) PacketParserUtils.parseStanza(fileContent);
-
-        return info;
+        return PacketParserUtils.parseStanza(fileContent);
     }
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java
index 8aa027514..3bf27e9a6 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java
@@ -32,9 +32,7 @@ public class CapsExtensionProvider extends ExtensionElementProvider<CapsExtensio
     @Override
     public CapsExtension parse(XmlPullParser parser, int initialDepth) throws XmlPullParserException, IOException,
             SmackException {
-        String hash = null;
-        String version = null;
-        String node = null;
+        String hash, version, node;
         if (parser.getEventType() == XmlPullParser.START_TAG
                 && parser.getName().equalsIgnoreCase(EntityCapsManager.ELEMENT)) {
             hash = parser.getAttributeValue(null, "hash");
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java
index 346911f40..8e280dd0e 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java
@@ -53,8 +53,7 @@ import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
 public final class ChatStateManager extends Manager {
     public static final String NAMESPACE = "http://jabber.org/protocol/chatstates";
 
-    private static final Map<XMPPConnection, ChatStateManager> INSTANCES =
-            new WeakHashMap<XMPPConnection, ChatStateManager>();
+    private static final Map<XMPPConnection, ChatStateManager> INSTANCES = new WeakHashMap<>();
 
     private static final StanzaFilter filter = new NotFilter(new StanzaExtensionFilter(NAMESPACE));
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommand.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommand.java
index f4d132ffe..1bdf9fa6a 100755
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommand.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommand.java
@@ -419,7 +419,7 @@ public abstract class AdHocCommand {
         complete,
 
         /**
-         * The action is unknow. This is used when a recieved message has an
+         * The action is unknown. This is used when a received message has an
          * unknown action. It must not be used to send an execution request.
          */
         unknown
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandNote.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandNote.java
index 3d3ca8d99..31489b177 100755
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandNote.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandNote.java
@@ -24,8 +24,8 @@ package org.jivesoftware.smackx.commands;
  */
 public class AdHocCommandNote {
 
-    private Type type;
-    private String value;
+    private final Type type;
+    private final String value;
 
     /**
      * Creates a new adhoc command note with the specified type and value.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommand.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommand.java
index 984623133..4865137e0 100755
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommand.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommand.java
@@ -42,9 +42,9 @@ import org.jxmpp.jid.Jid;
 public abstract class LocalCommand extends AdHocCommand {
 
     /**
-     * The time stamp of first invokation of the command. Used to implement the session timeout.
+     * The time stamp of first invocation of the command. Used to implement the session timeout.
      */
-    private long creationDate;
+    private final long creationDate;
 
     /**
      * The unique ID of the execution of the command.
@@ -59,12 +59,12 @@ public abstract class LocalCommand extends AdHocCommand {
     /**
      * The number of the current stage.
      */
-    private int currenStage;
+    private int currentStage;
 
     public LocalCommand() {
         super();
         this.creationDate = System.currentTimeMillis();
-        currenStage = -1;
+        currentStage = -1;
     }
 
     /**
@@ -139,7 +139,7 @@ public abstract class LocalCommand extends AdHocCommand {
      * @return the current stage number.
      */
     public int getCurrentStage() {
-        return currenStage;
+        return currentStage;
     }
 
     @Override
@@ -154,7 +154,7 @@ public abstract class LocalCommand extends AdHocCommand {
      * 
      */
     void incrementStage() {
-        currenStage++;
+        currentStage++;
     }
 
     /**
@@ -163,6 +163,6 @@ public abstract class LocalCommand extends AdHocCommand {
      * 
      */
     void decrementStage() {
-        currenStage--;
+        currentStage--;
     }
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java
index 53494a99c..10507ecea 100755
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java
@@ -46,12 +46,12 @@ public class RemoteCommand extends AdHocCommand {
     /**
      * The connection that is used to execute this command
      */
-    private XMPPConnection connection;
+    private final XMPPConnection connection;
 
     /**
      * The full JID of the command host
      */
-    private Jid jid;
+    private final Jid jid;
 
     /**
      * The session ID of this execution.
@@ -132,8 +132,8 @@ public class RemoteCommand extends AdHocCommand {
      */
     private void executeAction(Action action, Form form) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
         // TODO: Check that all the required fields of the form were filled, if
-        // TODO: not throw the corresponding exeption. This will make a faster response,
-        // TODO: since the request is stoped before it's sent.
+        // TODO: not throw the corresponding exception. This will make a faster response,
+        // TODO: since the request is stopped before it's sent.
         AdHocCommandData data = new AdHocCommandData();
         data.setType(IQ.Type.set);
         data.setTo(getOwnerJID());
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/packet/AdHocCommandData.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/packet/AdHocCommandData.java
index da2d59492..4c3c58b28 100755
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/packet/AdHocCommandData.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/packet/AdHocCommandData.java
@@ -53,7 +53,7 @@ public class AdHocCommandData extends IQ {
     /* Unique ID of the execution */
     private String sessionID;
 
-    private List<AdHocCommandNote> notes = new ArrayList<AdHocCommandNote>();
+    private final List<AdHocCommandNote> notes = new ArrayList<>();
 
     private DataForm form;
 
@@ -63,7 +63,7 @@ public class AdHocCommandData extends IQ {
     /* Current execution status */
     private AdHocCommand.Status status;
 
-    private ArrayList<AdHocCommand.Action> actions = new ArrayList<AdHocCommand.Action>();
+    private final ArrayList<AdHocCommand.Action> actions = new ArrayList<>();
 
     private AdHocCommand.Action executeAction;
 
@@ -164,7 +164,7 @@ public class AdHocCommandData extends IQ {
         this.notes.add(note);
     }
 
-    public void remveNote(AdHocCommandNote note) {
+    public void removeNote(AdHocCommandNote note) {
         this.notes.remove(note);
     }
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java
index 207221ed3..35450dabb 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java
@@ -26,7 +26,7 @@ import org.jivesoftware.smackx.disco.packet.DiscoverItems;
 
 
 /**
- * The NodeInformationProvider is responsible for providing supported indentities, features
+ * The NodeInformationProvider is responsible for providing supported identities, features
  * and hosted items (i.e. DiscoverItems.Item) about a given node. This information will be
  * requested each time this XMPPP client receives a disco info or items requests on the
  * given node. each time this XMPPP client receives a disco info or items requests on the
@@ -56,7 +56,7 @@ public interface NodeInformationProvider {
     List<String> getNodeFeatures();
 
     /**
-     * Returns a list of the indentites defined in the node. For
+     * Returns a list of the identities defined in the node. For
      * example, the x-command protocol must provide an identity of
      * category automation and type command-node for each command.
      *
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java
index 80de8ee8a..0b861eaf1 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java
@@ -78,17 +78,16 @@ public final class ServiceDiscoveryManager extends Manager {
     private static DiscoverInfo.Identity defaultIdentity = new Identity(DEFAULT_IDENTITY_CATEGORY,
             DEFAULT_IDENTITY_NAME, DEFAULT_IDENTITY_TYPE);
 
-    private Set<DiscoverInfo.Identity> identities = new HashSet<DiscoverInfo.Identity>();
+    private final Set<DiscoverInfo.Identity> identities = new HashSet<>();
     private DiscoverInfo.Identity identity = defaultIdentity;
 
     private EntityCapsManager capsManager;
 
-    private static Map<XMPPConnection, ServiceDiscoveryManager> instances = new WeakHashMap<>();
+    private static final Map<XMPPConnection, ServiceDiscoveryManager> instances = new WeakHashMap<>();
 
-    private final Set<String> features = new HashSet<String>();
+    private final Set<String> features = new HashSet<>();
     private DataForm extendedInfo = null;
-    private Map<String, NodeInformationProvider> nodeInformationProviders =
-            new ConcurrentHashMap<String, NodeInformationProvider>();
+    private final Map<String, NodeInformationProvider> nodeInformationProviders = new ConcurrentHashMap<>();
 
     // Create a new ServiceDiscoveryManager on every established connection
     static {
@@ -270,7 +269,7 @@ public final class ServiceDiscoveryManager extends Manager {
      * @return all identies as set
      */
     public Set<DiscoverInfo.Identity> getIdentities() {
-        Set<Identity> res = new HashSet<Identity>(identities);
+        Set<Identity> res = new HashSet<>(identities);
         // Add the default identity that must exist
         res.add(defaultIdentity);
         return Collections.unmodifiableSet(res);
@@ -368,7 +367,7 @@ public final class ServiceDiscoveryManager extends Manager {
      * @return a List of the supported features by this XMPP entity.
      */
     public synchronized List<String> getFeatures() {
-        return new ArrayList<String>(features);
+        return new ArrayList<>(features);
     }
 
     /**
@@ -455,7 +454,7 @@ public final class ServiceDiscoveryManager extends Manager {
     public List<ExtensionElement> getExtendedInfoAsList() {
         List<ExtensionElement> res = null;
         if (extendedInfo != null) {
-            res = new ArrayList<ExtensionElement>(1);
+            res = new ArrayList<>(1);
             res.add(extendedInfo);
         }
         return res;
@@ -748,7 +747,7 @@ public final class ServiceDiscoveryManager extends Manager {
      * Create a cache to hold the 25 most recently lookup services for a given feature for a period
      * of 24 hours.
      */
-    private Cache<String, List<DiscoverInfo>> services = new ExpirationCache<>(25,
+    private final Cache<String, List<DiscoverInfo>> services = new ExpirationCache<>(25,
                     24 * 60 * 60 * 1000);
 
     /**
@@ -784,7 +783,7 @@ public final class ServiceDiscoveryManager extends Manager {
      */
     public List<DiscoverInfo> findServicesDiscoverInfo(String feature, boolean stopOnFirst, boolean useCache, Map<? super Jid, Exception> encounteredExceptions)
                     throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
-        List<DiscoverInfo> serviceDiscoInfo = null;
+        List<DiscoverInfo> serviceDiscoInfo;
         DomainBareJid serviceName = connection().getXMPPServiceDomain();
         if (useCache) {
             serviceDiscoInfo = services.lookup(feature);
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java
index 8d07bd37f..0d760a02e 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java
@@ -45,10 +45,10 @@ public class DiscoverInfo extends IQ implements TypedCloneable<DiscoverInfo> {
     public static final String ELEMENT = QUERY_ELEMENT;
     public static final String NAMESPACE = "http://jabber.org/protocol/disco#info";
 
-    private final List<Feature> features = new LinkedList<Feature>();
-    private final Set<Feature> featuresSet = new HashSet<Feature>();
-    private final List<Identity> identities = new LinkedList<Identity>();
-    private final Set<String> identitiesSet = new HashSet<String>();
+    private final List<Feature> features = new LinkedList<>();
+    private final Set<Feature> featuresSet = new HashSet<>();
+    private final List<Identity> identities = new LinkedList<>();
+    private final Set<String> identitiesSet = new HashSet<>();
     private String node;
     private boolean containsDuplicateFeatures;
 
@@ -169,7 +169,7 @@ public class DiscoverInfo extends IQ implements TypedCloneable<DiscoverInfo> {
      * @return a list of Identites with the given category and type.
      */
     public List<Identity> getIdentities(String category, String type) {
-        List<Identity> res = new ArrayList<Identity>(identities.size());
+        List<Identity> res = new ArrayList<>(identities.size());
         for (Identity identity : identities) {
             if (identity.getCategory().equals(category) && identity.getType().equals(type)) {
                 res.add(identity);
@@ -208,7 +208,7 @@ public class DiscoverInfo extends IQ implements TypedCloneable<DiscoverInfo> {
      * Returns true if the specified feature is part of the discovered information.
      * 
      * @param feature the feature to check
-     * @return true if the requestes feature has been discovered
+     * @return true if the requests feature has been discovered
      */
     public boolean containsFeature(CharSequence feature) {
         return features.contains(new Feature(feature));
@@ -234,7 +234,7 @@ public class DiscoverInfo extends IQ implements TypedCloneable<DiscoverInfo> {
      * @return true if duplicate identities where found, otherwise false
      */
     public boolean containsDuplicateIdentities() {
-        List<Identity> checkedIdentities = new LinkedList<Identity>();
+        List<Identity> checkedIdentities = new LinkedList<>();
         for (Identity i : identities) {
             for (Identity i2 : checkedIdentities) {
                 if (i.equals(i2))
@@ -472,7 +472,7 @@ public class DiscoverInfo extends IQ implements TypedCloneable<DiscoverInfo> {
     }
 
     /**
-     * Represents the features offered by the item. This information helps requestors determine 
+     * Represents the features offered by the item. This information helps the requester to determine
      * what actions are possible with regard to this item (registration, search, join, etc.) 
      * as well as specific feature types of interest, if any (e.g., for the purpose of feature 
      * negotiation).
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java
index 09f8f0b60..78fc3f2ac 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java
@@ -40,7 +40,7 @@ public class DiscoverItems extends IQ {
     public static final String ELEMENT = QUERY_ELEMENT;
     public static final String NAMESPACE = "http://jabber.org/protocol/disco#items";
 
-    private final List<Item> items = new LinkedList<Item>();
+    private final List<Item> items = new LinkedList<>();
     private String node;
 
     public DiscoverItems() {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java
index 85383e52b..28c1d0c31 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java
@@ -36,7 +36,7 @@ public class DiscoverInfoProvider extends IQProvider<DiscoverInfo> {
                     throws Exception {
         DiscoverInfo discoverInfo = new DiscoverInfo();
         boolean done = false;
-        DiscoverInfo.Identity identity = null;
+        DiscoverInfo.Identity identity;
         String category = "";
         String identityName = "";
         String type = "";
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java
index 2225788d1..47180b696 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java
@@ -65,11 +65,11 @@ public class FaultTolerantNegotiator extends StreamNegotiator {
     @Override
     public InputStream createIncomingStream(final StreamInitiation initiation) throws SmackException, XMPPErrorException, InterruptedException {
         // This could be either an xep47 ibb 'open' iq or an xep65 streamhost iq
-        IQ initationSet = initiateIncomingStream(connection(), initiation);
+        IQ initiationSet = initiateIncomingStream(connection(), initiation);
 
-        StreamNegotiator streamNegotiator = determineNegotiator(initationSet);
+        StreamNegotiator streamNegotiator = determineNegotiator(initiationSet);
 
-        return streamNegotiator.negotiateIncomingStream(initationSet);
+        return streamNegotiator.negotiateIncomingStream(initiationSet);
     }
 
     private StreamNegotiator determineNegotiator(Stanza streamInitiation) {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java
index 2c35d3f40..d544d43ef 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java
@@ -47,7 +47,7 @@ import org.jxmpp.jid.EntityFullJid;
  */
 public final class FileTransferManager extends Manager {
 
-    private static final Map<XMPPConnection, FileTransferManager> INSTANCES = new WeakHashMap<XMPPConnection, FileTransferManager>();
+    private static final Map<XMPPConnection, FileTransferManager> INSTANCES = new WeakHashMap<>();
 
     public static synchronized FileTransferManager getInstanceFor(XMPPConnection connection) {
         FileTransferManager fileTransferManager = INSTANCES.get(connection);
@@ -60,7 +60,7 @@ public final class FileTransferManager extends Manager {
 
     private final FileTransferNegotiator fileTransferNegotiator;
 
-    private final List<FileTransferListener> listeners = new CopyOnWriteArrayList<FileTransferListener>();
+    private final List<FileTransferListener> listeners = new CopyOnWriteArrayList<>();
 
     /**
      * Creates a file transfer manager to initiate and receive file transfers.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
index 4cbd8737a..243af6190 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
@@ -60,7 +60,7 @@ public final class FileTransferNegotiator extends Manager {
     public static final String SI_PROFILE_FILE_TRANSFER_NAMESPACE = "http://jabber.org/protocol/si/profile/file-transfer";
     private static final String[] NAMESPACE = { SI_NAMESPACE, SI_PROFILE_FILE_TRANSFER_NAMESPACE };
 
-    private static final Map<XMPPConnection, FileTransferNegotiator> INSTANCES = new WeakHashMap<XMPPConnection, FileTransferNegotiator>();
+    private static final Map<XMPPConnection, FileTransferNegotiator> INSTANCES = new WeakHashMap<>();
 
     private static final String STREAM_INIT_PREFIX = "jsi_";
 
@@ -105,7 +105,7 @@ public final class FileTransferNegotiator extends Manager {
         ServiceDiscoveryManager manager = ServiceDiscoveryManager
                 .getInstanceFor(connection);
 
-        List<String> namespaces = new ArrayList<String>();
+        List<String> namespaces = new ArrayList<>();
         namespaces.addAll(Arrays.asList(NAMESPACE));
         namespaces.add(DataPacketExtension.NAMESPACE);
         if (!IBB_ONLY) {
@@ -132,7 +132,7 @@ public final class FileTransferNegotiator extends Manager {
         ServiceDiscoveryManager manager = ServiceDiscoveryManager
                 .getInstanceFor(connection);
 
-        List<String> namespaces = new ArrayList<String>();
+        List<String> namespaces = new ArrayList<>();
         namespaces.addAll(Arrays.asList(NAMESPACE));
         namespaces.add(DataPacketExtension.NAMESPACE);
         if (!IBB_ONLY) {
@@ -153,7 +153,7 @@ public final class FileTransferNegotiator extends Manager {
      * @return Returns a collection of the supported transfer protocols.
      */
     public static Collection<String> getSupportedProtocols() {
-        List<String> protocols = new ArrayList<String>();
+        List<String> protocols = new ArrayList<>();
         protocols.add(DataPacketExtension.NAMESPACE);
         if (!IBB_ONLY) {
             protocols.add(Bytestream.NAMESPACE);
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java
index 3eaefe48c..dfc15e8c3 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java
@@ -46,7 +46,7 @@ import org.jxmpp.jid.Jid;
  */
 public class IBBTransferNegotiator extends StreamNegotiator {
 
-    private InBandBytestreamManager manager;
+    private final InBandBytestreamManager manager;
 
     /**
      * The default constructor for the In-Band Bytestream Negotiator.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
index 79296a3af..d42522350 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
@@ -22,12 +22,10 @@ import java.io.OutputStream;
 import java.io.PushbackInputStream;
 
 import org.jivesoftware.smack.SmackException;
-import org.jivesoftware.smack.SmackException.NoResponseException;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.XMPPException.XMPPErrorException;
 import org.jivesoftware.smack.packet.Stanza;
-
 import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager;
 import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamRequest;
 import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamSession;
@@ -45,7 +43,7 @@ import org.jxmpp.jid.Jid;
  */
 public class Socks5TransferNegotiator extends StreamNegotiator {
 
-    private Socks5BytestreamManager manager;
+    private final Socks5BytestreamManager manager;
 
     Socks5TransferNegotiator(XMPPConnection connection) {
         super(connection);
@@ -53,7 +51,7 @@ public class Socks5TransferNegotiator extends StreamNegotiator {
     }
 
     @Override
-    public OutputStream createOutgoingStream(String streamID, Jid initiator, Jid target) throws NoResponseException, SmackException, XMPPException
+    public OutputStream createOutgoingStream(String streamID, Jid initiator, Jid target) throws SmackException, XMPPException
                     {
         try {
             return this.manager.establishSession(target, streamID).getOutputStream();
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
index f3e537167..6f491a36a 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
@@ -137,7 +137,7 @@ public abstract class StreamNegotiator extends Manager {
 
 
     abstract InputStream negotiateIncomingStream(Stanza streamInitiation) throws XMPPErrorException,
-            InterruptedException, NoResponseException, SmackException;
+            InterruptedException, SmackException;
 
     /**
      * This method handles the file stream download negotiation process. The
@@ -156,7 +156,7 @@ public abstract class StreamNegotiator extends Manager {
      * @throws SmackException 
      */
     public abstract InputStream createIncomingStream(StreamInitiation initiation)
-            throws XMPPErrorException, InterruptedException, NoResponseException, SmackException;
+            throws XMPPErrorException, InterruptedException, SmackException;
 
     /**
      * This method handles the file upload stream negotiation process. The
@@ -169,14 +169,12 @@ public abstract class StreamNegotiator extends Manager {
      * @param target    The fully-qualified JID of the target or receiver of the file
      *                  transfer.
      * @return The negotiated stream ready for data.
-     * @throws XMPPErrorException If an error occurs during the negotiation process an
-     *                       exception will be thrown.
      * @throws SmackException 
      * @throws XMPPException 
      * @throws InterruptedException 
      */
     public abstract OutputStream createOutgoingStream(String streamID,
-            Jid initiator, Jid target) throws XMPPErrorException, NoResponseException, SmackException, XMPPException, InterruptedException;
+            Jid initiator, Jid target) throws SmackException, XMPPException, InterruptedException;
 
     /**
      * Returns the XMPP namespace reserved for this particular type of file
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/GeoLocationManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/GeoLocationManager.java
index 2bdaef117..7331294c8 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/GeoLocationManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/GeoLocationManager.java
@@ -32,7 +32,7 @@ import org.jxmpp.jid.Jid;
 
 public final class GeoLocationManager extends Manager {
 
-    private static final Map<XMPPConnection, GeoLocationManager> INSTANCES = new WeakHashMap<XMPPConnection, GeoLocationManager>();
+    private static final Map<XMPPConnection, GeoLocationManager> INSTANCES = new WeakHashMap<>();
 
     static {
         XMPPConnectionRegistry.addConnectionCreationListener(new ConnectionCreationListener() {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/packet/GeoLocation.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/packet/GeoLocation.java
index 2d89f1372..79721ff8c 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/packet/GeoLocation.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/packet/GeoLocation.java
@@ -91,7 +91,7 @@ public final class GeoLocation implements Serializable, ExtensionElement {
         if (accuracy != null) {
             error = null;
             LOGGER.log(Level.WARNING,
-                            "Error and accurracy set. Ignoring error as it is deprecated in favor of accuracy");
+                            "Error and accuracy set. Ignoring error as it is deprecated in favor of accuracy");
         }
 
         this.error = error;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java
index 5ca15a378..dd9385b94 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java
@@ -92,7 +92,7 @@ import org.jxmpp.jid.Jid;
  */
 
 public final class LastActivityManager extends Manager {
-    private static final Map<XMPPConnection, LastActivityManager> instances = new WeakHashMap<XMPPConnection, LastActivityManager>();
+    private static final Map<XMPPConnection, LastActivityManager> instances = new WeakHashMap<>();
 //    private static final PacketFilter IQ_GET_LAST_FILTER = new AndFilter(IQTypeFilter.GET,
 //                    new StanzaTypeFilter(LastActivity.class));
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java
index 0954b01cb..2d431af17 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java
@@ -77,7 +77,7 @@ public final class PrivateDataManager extends Manager {
     /**
      * Map of provider instances.
      */
-    private static Map<String, PrivateDataProvider> privateDataProviders = new Hashtable<String, PrivateDataProvider>();
+    private static final Map<String, PrivateDataProvider> privateDataProviders = new Hashtable<>();
 
     /**
      * Returns the private data provider registered to the specified XML element name and namespace.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/DefaultPrivateData.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/DefaultPrivateData.java
index 83474b3c3..a1d9cdf50 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/DefaultPrivateData.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/DefaultPrivateData.java
@@ -46,8 +46,8 @@ import java.util.Set;
  */
 public class DefaultPrivateData implements PrivateData {
 
-    private String elementName;
-    private String namespace;
+    private final String elementName;
+    private final String namespace;
     private Map<String, String> map;
 
     /**
@@ -103,7 +103,7 @@ public class DefaultPrivateData implements PrivateData {
      */
     public synchronized Set<String> getNames() {
         if (map == null) {
-            return Collections.<String>emptySet();
+            return Collections.emptySet();
         }
         return Collections.unmodifiableSet(map.keySet());
     }
@@ -129,7 +129,7 @@ public class DefaultPrivateData implements PrivateData {
      */
     public synchronized void setValue(String name, String value) {
         if (map == null) {
-            map = new HashMap<String,String>();
+            map = new HashMap<>();
         }
         map.put(name, value);
     }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/PrivateData.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/PrivateData.java
index 41d50b11b..058b0c2d5 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/PrivateData.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/PrivateData.java
@@ -31,19 +31,19 @@ public interface PrivateData {
      *
      * @return the element name.
      */
-    public String getElementName();
+    String getElementName();
 
     /**
      * Returns the root element XML namespace.
      *
      * @return the namespace.
      */
-    public String getNamespace();
+    String getNamespace();
 
     /**
      * Returns the XML reppresentation of the PrivateData.
      *
      * @return the private data as XML.
      */
-    public CharSequence toXML();
+    CharSequence toXML();
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java
index c91457cde..3828675f1 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java
@@ -44,5 +44,5 @@ public interface PrivateDataProvider {
      * @param parser an XML parser.
      * @return a new PrivateData instance.
      */
-    public PrivateData parsePrivateData(XmlPullParser parser) throws XmlPullParserException, IOException, SmackException;
+    PrivateData parsePrivateData(XmlPullParser parser) throws XmlPullParserException, IOException, SmackException;
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java
index 259eecd1b..d019f1727 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java
@@ -48,7 +48,7 @@ import org.jxmpp.jid.parts.Localpart;
  */
 public final class AccountManager extends Manager {
 
-    private static final Map<XMPPConnection, AccountManager> INSTANCES = new WeakHashMap<XMPPConnection, AccountManager>();
+    private static final Map<XMPPConnection, AccountManager> INSTANCES = new WeakHashMap<>();
 
     /**
      * Returns the AccountManager instance associated with a given XMPPConnection.
@@ -247,7 +247,7 @@ public final class AccountManager extends Manager {
      */
     public void createAccount(Localpart username, String password) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException  {
         // Create a map for all the required attributes, but give them blank values.
-        Map<String, String> attributes = new HashMap<String, String>();
+        Map<String, String> attributes = new HashMap<>();
         for (String attributeName : getAccountAttributes()) {
             attributes.put(attributeName, "");
         }
@@ -303,7 +303,7 @@ public final class AccountManager extends Manager {
         if (!connection().isSecureConnection() && !allowSensitiveOperationOverInsecureConnection) {
             throw new IllegalStateException("Changing password over insecure connection.");
         }
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         map.put("username",  connection().getUser().getLocalpart().toString());
         map.put("password",newPassword);
         Registration reg = new Registration(map);
@@ -324,7 +324,7 @@ public final class AccountManager extends Manager {
      * @throws InterruptedException 
      */
     public void deleteAccount() throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
-        Map<String, String> attributes = new HashMap<String, String>();
+        Map<String, String> attributes = new HashMap<>();
         // To delete an account, we add a single attribute, "remove", that is blank.
         attributes.put("remove", "");
         Registration reg = new Registration(attributes);
@@ -369,7 +369,6 @@ public final class AccountManager extends Manager {
     }
 
     private StanzaCollector createStanzaCollectorAndSend(IQ req) throws NotConnectedException, InterruptedException {
-        StanzaCollector collector = connection().createStanzaCollectorAndSend(new StanzaIdFilter(req.getStanzaId()), req);
-        return collector;
+        return connection().createStanzaCollectorAndSend(new StanzaIdFilter(req.getStanzaId()), req);
     }
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/provider/RegistrationProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/provider/RegistrationProvider.java
index 578a7eb24..c0d13b2f6 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/provider/RegistrationProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/provider/RegistrationProvider.java
@@ -36,8 +36,8 @@ public class RegistrationProvider extends IQProvider<Registration> {
     public Registration parse(XmlPullParser parser, int initialDepth)
                     throws Exception {
         String instruction = null;
-        Map<String, String> fields = new HashMap<String, String>();
-        List<ExtensionElement> packetExtensions = new LinkedList<ExtensionElement>();
+        Map<String, String> fields = new HashMap<>();
+        List<ExtensionElement> packetExtensions = new LinkedList<>();
         outerloop:
         while (true) {
             int eventType = parser.next();
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/VersionManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/VersionManager.java
index 57c8de381..18727e0c8 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/VersionManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/VersionManager.java
@@ -55,7 +55,7 @@ import org.jxmpp.jid.Jid;
  * @author Georg Lukas
  */
 public final class VersionManager extends Manager {
-    private static final Map<XMPPConnection, VersionManager> INSTANCES = new WeakHashMap<XMPPConnection, VersionManager>();
+    private static final Map<XMPPConnection, VersionManager> INSTANCES = new WeakHashMap<>();
 
     private static Version defaultVersion;
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/packet/JivePropertiesExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/packet/JivePropertiesExtension.java
index 843626de3..a5929a9cd 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/packet/JivePropertiesExtension.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/packet/JivePropertiesExtension.java
@@ -52,7 +52,7 @@ public class JivePropertiesExtension implements ExtensionElement {
     private final Map<String, Object> properties;
 
     public JivePropertiesExtension() {
-        properties = new HashMap<String, Object>();
+        properties = new HashMap<>();
     }
 
     public JivePropertiesExtension(Map<String, Object> properties) {
@@ -84,7 +84,7 @@ public class JivePropertiesExtension implements ExtensionElement {
      */
     public synchronized void setProperty(String name, Object value) {
         if (!(value instanceof Serializable)) {
-            throw new IllegalArgumentException("Value must be serialiazble");
+            throw new IllegalArgumentException("Value must be serializable");
         }
         properties.put(name, value);
     }
@@ -110,7 +110,7 @@ public class JivePropertiesExtension implements ExtensionElement {
         if (properties == null) {
             return Collections.emptySet();
         }
-        return Collections.unmodifiableSet(new HashSet<String>(properties.keySet()));
+        return Collections.unmodifiableSet(new HashSet<>(properties.keySet()));
     }
 
     /**
@@ -122,7 +122,7 @@ public class JivePropertiesExtension implements ExtensionElement {
         if (properties == null) {
             return Collections.emptyMap();
         }
-        return Collections.unmodifiableMap(new HashMap<String, Object>(properties));
+        return Collections.unmodifiableMap(new HashMap<>(properties));
     }
 
     @Override
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java
index 822a74f0e..7e6d83617 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java
@@ -55,7 +55,7 @@ public class JivePropertiesExtensionProvider extends ExtensionElementProvider<Ji
     public JivePropertiesExtension parse(XmlPullParser parser,
                     int initialDepth) throws XmlPullParserException,
                     IOException {
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         while (true) {
             int eventType = parser.next();
             if (eventType == XmlPullParser.START_TAG && parser.getName().equals("property")) {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java
index 774482127..e10f38eff 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java
@@ -73,7 +73,7 @@ public class GroupChatInvitation implements ExtensionElement {
     /**
      * Creates a new group chat invitation to the specified room address.
      * GroupChat room addresses are in the form <tt>room@service</tt>,
-     * where <tt>service</tt> is the name of groupchat server, such as
+     * where <tt>service</tt> is the name of group chat server, such as
      * <tt>chat.example.com</tt>.
      *
      * @param roomAddress the address of the group chat room.
@@ -85,7 +85,7 @@ public class GroupChatInvitation implements ExtensionElement {
     /**
      * Returns the address of the group chat room. GroupChat room addresses
      * are in the form <tt>room@service</tt>, where <tt>service</tt> is
-     * the name of groupchat server, such as <tt>chat.example.com</tt>.
+     * the name of group chat server, such as <tt>chat.example.com</tt>.
      *
      * @return the address of the group chat room.
      */
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java
index 9a36c02e9..006947bde 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java
@@ -35,22 +35,22 @@ public class MUCAdmin extends IQ {
     public static final String ELEMENT = QUERY_ELEMENT;
     public static final String NAMESPACE = MUCInitialPresence.NAMESPACE + "#admin";
 
-    private final List<MUCItem> items = new ArrayList<MUCItem>();
+    private final List<MUCItem> items = new ArrayList<>();
 
     public MUCAdmin() {
         super(ELEMENT, NAMESPACE);
     }
 
     /**
-     * Returns a List of item childs that holds information about roles, affiliation,
+     * Returns a List of item children that holds information about roles, affiliation,
      * jids and nicks.
      * 
-     * @return a List of item childs that holds information about roles, affiliation,
+     * @return a List of item children that holds information about roles, affiliation,
      *          jids and nicks.
      */
     public List<MUCItem> getItems() {
         synchronized (items) {
-            return Collections.unmodifiableList(new ArrayList<MUCItem>(items));
+            return Collections.unmodifiableList(new ArrayList<>(items));
         }
     }
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java
index 8eba16597..60ce84d36 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java
@@ -177,7 +177,7 @@ public class MUCInitialPresence implements ExtensionElement {
 
         /**
          * Deprecated constructor.
-         * @deprecated use {@link #MUCInitialPresence.History(int, int, int, Date)} instead.
+         * @deprecated use {@link #History(int, int, int, Date)} instead.
          */
         @Deprecated
         public History() {
@@ -240,7 +240,7 @@ public class MUCInitialPresence implements ExtensionElement {
          * Sets the total number of characters to receive in the history.
          * 
          * @param maxChars the total number of characters to receive in the history.
-         * @deprecated use {@link #MUCInitialPresence.History(int, int, int, Date)} instead.
+         * @deprecated use {@link #History(int, int, int, Date)} instead.
          */
         @Deprecated
         public void setMaxChars(int maxChars) {
@@ -251,7 +251,7 @@ public class MUCInitialPresence implements ExtensionElement {
          * Sets the total number of messages to receive in the history.
          * 
          * @param maxStanzas the total number of messages to receive in the history.
-         * @deprecated use {@link #MUCInitialPresence.History(int, int, int, Date)} instead.
+         * @deprecated use {@link #History(int, int, int, Date)} instead.
          */
         @Deprecated
         public void setMaxStanzas(int maxStanzas) {
@@ -265,7 +265,7 @@ public class MUCInitialPresence implements ExtensionElement {
          * 
          * @param seconds the number of seconds to use to filter the messages received during 
          * that time.
-         * @deprecated use {@link #MUCInitialPresence.History(int, int, int, Date)} instead.
+         * @deprecated use {@link #History(int, int, int, Date)} instead.
          */
         @Deprecated
         public void setSeconds(int seconds) {
@@ -278,7 +278,7 @@ public class MUCInitialPresence implements ExtensionElement {
          * included in the history.
          * 
          * @param since the since date to use to filter the messages received during that time.
-         * @deprecated use {@link #MUCInitialPresence.History(int, int, int, Date)} instead.
+         * @deprecated use {@link #History(int, int, int, Date)} instead.
          */
         @Deprecated
         public void setSince(Date since) {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java
index 2a7dd19be..e6bebcd0d 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java
@@ -34,7 +34,7 @@ public class MUCOwner extends IQ {
     public static final String ELEMENT = QUERY_ELEMENT;
     public static final String NAMESPACE = MUCInitialPresence.NAMESPACE + "#owner";
 
-    private final List<MUCItem> items = new ArrayList<MUCItem>();
+    private final List<MUCItem> items = new ArrayList<>();
     private Destroy destroy;
 
     public MUCOwner() {
@@ -42,15 +42,15 @@ public class MUCOwner extends IQ {
     }
 
     /**
-     * Returns a List of item childs that holds information about affiliation,
+     * Returns a List of item children that holds information about affiliation,
      * jids and nicks.
      * 
-     * @return a List of item childs that holds information about affiliation,
+     * @return a List of item children that holds information about affiliation,
      *          jids and nicks.
      */
     public List<MUCItem> getItems() {
         synchronized (items) {
-            return Collections.unmodifiableList(new ArrayList<MUCItem>(items));
+            return Collections.unmodifiableList(new ArrayList<>(items));
         }
     }
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java
index 61a5c0412..ff5b0645b 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java
@@ -42,7 +42,7 @@ public class MUCUser implements ExtensionElement {
     public static final String ELEMENT = "x";
     public static final String NAMESPACE = MUCInitialPresence.NAMESPACE + "#user";
 
-    private final Set<Status> statusCodes = new HashSet<Status>(4);
+    private final Set<Status> statusCodes = new HashSet<>(4);
 
     private Invite invite;
     private Decline decline;
@@ -87,7 +87,7 @@ public class MUCUser implements ExtensionElement {
 
     /**
      * Returns the rejection to an invitation from another user to a room. The rejection will be
-     * sent to the room which in turn will forward the refusal to the inviter.
+     * sent to the room which in turn will forward the refusal to the inviting user.
      *
      * @return a rejection to an invitation from another user to a room.
      */
@@ -160,7 +160,7 @@ public class MUCUser implements ExtensionElement {
 
     /**
      * Sets the rejection to an invitation from another user to a room. The rejection will be
-     * sent to the room which in turn will forward the refusal to the inviter.
+     * sent to the room which in turn will forward the refusal to the inviting user.
      *
      * @param decline the rejection to an invitation from another user to a room.
      */
@@ -252,7 +252,7 @@ public class MUCUser implements ExtensionElement {
         private final String reason;
 
         /**
-         * From XEP-0045 § 7.8.2: "… whose value is the bare JID, full JID, or occupant JID of the inviter …" 
+         * From XEP-0045 § 7.8.2: "… whose value is the bare JID, full JID, or occupant JID of the inviting user …"
          */
         private final EntityJid from;
 
@@ -273,7 +273,7 @@ public class MUCUser implements ExtensionElement {
         }
 
         /**
-         * Returns the bare JID of the inviter or, optionally, the room JID. (e.g.
+         * Returns the bare JID of the inviting user or, optionally, the room JID. (e.g.
          * 'crone1@shakespeare.lit/desktop').
          *
          * @return the room's occupant that sent the invitation.
@@ -319,7 +319,7 @@ public class MUCUser implements ExtensionElement {
 
     /**
      * Represents a rejection to an invitation from another user to a room. The rejection will be
-     * sent to the room which in turn will forward the refusal to the inviter.
+     * sent to the room which in turn will forward the refusal to the inviting user.
      *
      * @author Gaston Dombiak
      */
@@ -360,9 +360,9 @@ public class MUCUser implements ExtensionElement {
         }
 
         /**
-         * Returns the bare JID of the inviter. (e.g. 'hecate@shakespeare.lit')
+         * Returns the bare JID of the inviting user. (e.g. 'hecate@shakespeare.lit')
          *
-         * @return the bare JID of the inviter.
+         * @return the bare JID of the inviting user.
          */
         public EntityBareJid getTo() {
             return to;
@@ -394,7 +394,7 @@ public class MUCUser implements ExtensionElement {
     public static final class Status implements NamedElement {
         public static final String ELEMENT = "status";
 
-        private static final Map<Integer, Status> statusMap = new HashMap<Integer, Status>(8);
+        private static final Map<Integer, Status> statusMap = new HashMap<>(8);
 
         public static final Status PRESENCE_TO_SELF_110 = Status.create(110);
         public static final Status ROOM_CREATED_201 = Status.create(201);
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java
index cd01eea76..f395313f6 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java
@@ -123,7 +123,7 @@ public class OfflineMessageManager {
      * @throws InterruptedException 
      */
     public List<OfflineMessageHeader> getHeaders() throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
-        List<OfflineMessageHeader> answer = new ArrayList<OfflineMessageHeader>();
+        List<OfflineMessageHeader> answer = new ArrayList<>();
         DiscoverItems items = ServiceDiscoveryManager.getInstanceFor(connection).discoverItems(
                 null, namespace);
         for (DiscoverItems.Item item : items.getItems()) {
@@ -148,7 +148,7 @@ public class OfflineMessageManager {
      * @throws InterruptedException 
      */
     public List<Message> getMessages(final List<String> nodes) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
-        List<Message> messages = new ArrayList<Message>(nodes.size());
+        List<Message> messages = new ArrayList<>(nodes.size());
         OfflineMessageRequest request = new OfflineMessageRequest();
         for (String node : nodes) {
             OfflineMessageRequest.Item item = new OfflineMessageRequest.Item(node);
@@ -159,7 +159,7 @@ public class OfflineMessageManager {
         StanzaFilter messageFilter = new AndFilter(PACKET_FILTER, new StanzaFilter() {
             @Override
             public boolean accept(Stanza packet) {
-                OfflineMessageInfo info = (OfflineMessageInfo) packet.getExtension("offline",
+                OfflineMessageInfo info = packet.getExtension("offline",
                         namespace);
                 return nodes.contains(info.getNode());
             }
@@ -208,7 +208,7 @@ public class OfflineMessageManager {
         StanzaCollector.Configuration messageCollectorConfiguration = StanzaCollector.newConfiguration().setStanzaFilter(PACKET_FILTER).setCollectorToReset(resultCollector);
         StanzaCollector messageCollector = connection.createStanzaCollector(messageCollectorConfiguration);
 
-        List<Message> messages = null;
+        List<Message> messages;
         try {
             resultCollector.nextResultOrThrow();
             // Be extra safe, cancel the message collector right here so that it does not collector
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java
index 96cbcb2be..213a40046 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java
@@ -48,15 +48,15 @@ public class OfflineMessageRequest extends IQ {
     }
 
     /**
-     * Returns a List of item childs that holds information about offline messages to
+     * Returns a List of item children that holds information about offline messages to
      * view or delete.
      *
-     * @return a List of item childs that holds information about offline messages to
+     * @return a List of item children that holds information about offline messages to
      *         view or delete.
      */
     public List<Item> getItems() {
         synchronized (items) {
-            return Collections.unmodifiableList(new ArrayList<Item>(items));
+            return Collections.unmodifiableList(new ArrayList<>(items));
         }
     }
 
@@ -112,8 +112,7 @@ public class OfflineMessageRequest extends IQ {
         buf.rightAngleBracket();
 
         synchronized (items) {
-            for (int i = 0; i < items.size(); i++) {
-                Item item = items.get(i);
+            for (Item item : items) {
                 buf.append(item.toXML());
             }
         }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPListener.java
index da183c0de..95506ec34 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPListener.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPListener.java
@@ -40,6 +40,6 @@ public interface PEPListener {
      * @param event the event contained in the message.
      * @param message the message stanza containing the PEP event.
      */
-    public void eventReceived(EntityBareJid from, EventElement event, Message message);
+    void eventReceived(EntityBareJid from, EventElement event, Message message);
 
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java
index ca0a582b2..2a28d48b7 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java
@@ -50,7 +50,7 @@ import org.jxmpp.jid.EntityBareJid;
 /**
  *
  * Manages Personal Event Publishing (XEP-163). A PEPManager provides a high level access to
- * pubsub personal events. It also provides an easy way
+ * PubSub personal events. It also provides an easy way
  * to hook up custom logic when events are received from another XMPP client through PEPListeners.
  * 
  * Use example:
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
index 79dca32bf..e8e66f8c5 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
@@ -68,7 +68,7 @@ import org.jxmpp.jid.Jid;
 public final class PingManager extends Manager {
     private static final Logger LOGGER = Logger.getLogger(PingManager.class.getName());
 
-    private static final Map<XMPPConnection, PingManager> INSTANCES = new WeakHashMap<XMPPConnection, PingManager>();
+    private static final Map<XMPPConnection, PingManager> INSTANCES = new WeakHashMap<>();
 
     static {
         XMPPConnectionRegistry.addConnectionCreationListener(new ConnectionCreationListener() {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListListener.java
index 476f962c4..f9ea149aa 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListListener.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListListener.java
@@ -36,13 +36,13 @@ public interface PrivacyListListener {
      * @param listName the name of the new or updated privacy list.
      * @param listItem the PrivacyItems that rules the list.
      */
-    public void setPrivacyList(String listName, List<PrivacyItem> listItem);
+    void setPrivacyList(String listName, List<PrivacyItem> listItem);
 
     /**
      * A privacy list has been modified by another. It gets notified.
      *
      * @param listName the name of the updated privacy list.
      */
-    public void updatedPrivacyList(String listName);
+    void updatedPrivacyList(String listName);
 
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java
index e457c6223..472ee1fe7 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java
@@ -72,9 +72,9 @@ public final class PrivacyListManager extends Manager {
     private static final StanzaFilter PRIVACY_RESULT = new AndFilter(IQTypeFilter.RESULT, PRIVACY_FILTER);
 
     // Keep the list of instances of this class.
-    private static final Map<XMPPConnection, PrivacyListManager> INSTANCES = new WeakHashMap<XMPPConnection, PrivacyListManager>();
+    private static final Map<XMPPConnection, PrivacyListManager> INSTANCES = new WeakHashMap<>();
 
-    private final Set<PrivacyListListener> listeners = new CopyOnWriteArraySet<PrivacyListListener>();
+    private final Set<PrivacyListListener> listeners = new CopyOnWriteArraySet<>();
 
     static {
         // Create a new PrivacyListManager on every established connection.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/Privacy.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/Privacy.java
index 754d8e103..d96846fc6 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/Privacy.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/Privacy.java
@@ -55,7 +55,7 @@ public class Privacy extends IQ {
     private String defaultName;
     /** itemLists holds the set of privacy items classified in lists. It is a map where the 
      * key is the name of the list and the value a collection with privacy items. **/
-    private Map<String, List<PrivacyItem>> itemLists = new HashMap<String, List<PrivacyItem>>();
+    private final Map<String, List<PrivacyItem>> itemLists = new HashMap<>();
 
     public Privacy() {
         super(ELEMENT, NAMESPACE);
@@ -271,7 +271,7 @@ public class Privacy extends IQ {
     public boolean isDeclineActiveList() {
         return declineActiveList;
     }
-    // CHECKSYTLE:ON
+    // CHECKSTYLE:ON
 
     /** 
      * Sets whether the receiver allows or declines the use of an active list.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/PrivacyItem.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/PrivacyItem.java
index 10a6aa794..dd062fad0 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/PrivacyItem.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/PrivacyItem.java
@@ -328,7 +328,7 @@ public class PrivacyItem {
     /**
      * Type defines if the rule is based on JIDs, roster groups or presence subscription types.
      */
-    public static enum Type {
+    public enum Type {
         /**
          * JID being analyzed should belong to a roster group of the list's owner.
          */
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/provider/PrivacyProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/provider/PrivacyProvider.java
index 536d4bfde..88981bdc4 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/provider/PrivacyProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/provider/PrivacyProvider.java
@@ -83,7 +83,7 @@ public class PrivacyProvider extends IQProvider<Privacy> {
     private static void parseList(XmlPullParser parser, Privacy privacy) throws XmlPullParserException, IOException, SmackException {
         boolean done = false;
         String listName = parser.getAttributeValue("", "name");
-        ArrayList<PrivacyItem> items = new ArrayList<PrivacyItem>();
+        ArrayList<PrivacyItem> items = new ArrayList<>();
         while (!done) {
             int eventType = parser.next();
             if (eventType == XmlPullParser.START_TAG) {
@@ -128,7 +128,7 @@ public class PrivacyProvider extends IQProvider<Privacy> {
             allow = false;
             break;
         default:
-            throw new SmackException("Unkown action value '" + actionValue + "'");
+            throw new SmackException("Unknown action value '" + actionValue + "'");
         }
 
         PrivacyItem item;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/AccessModel.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/AccessModel.java
index eb2614872..3fe69c74b 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/AccessModel.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/AccessModel.java
@@ -17,8 +17,8 @@
 package org.jivesoftware.smackx.pubsub;
 
 /**
- * This enumeration represents the access models for the pubsub node
- * as defined in the pubsub specification section <a href="http://xmpp.org/extensions/xep-0060.html#registrar-formtypes-config">16.4.3</a>.
+ * This enumeration represents the access models for the PubSub node
+ * as defined in the PubSub specification section <a href="http://xmpp.org/extensions/xep-0060.html#registrar-formtypes-config">16.4.3</a>.
  * 
  * @author Robin Collier
  */
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Affiliation.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Affiliation.java
index 5445c8ef5..c2c00ca81 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Affiliation.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Affiliation.java
@@ -80,8 +80,8 @@ public class Affiliation implements ExtensionElement
         this.jid = jid;
         this.affiliation = affiliation;
         this.node = null;
-        // This is usually the pubsub#owner namesapce, but see xep60 example 208 where just 'pubsub' is used
-        // ("notification of affilliation change")
+        // This is usually the pubsub#owner namespace, but see xep60 example 208 where just 'pubsub' is used
+        // ("notification of affiliation change")
         this.namespace = namespace;
     }
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ChildrenAssociationPolicy.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ChildrenAssociationPolicy.java
index 9e5021b13..26fc085c3 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ChildrenAssociationPolicy.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ChildrenAssociationPolicy.java
@@ -18,7 +18,7 @@ package org.jivesoftware.smackx.pubsub;
 
 /**
  * This enumeration represents the children association policy for associating leaf nodes
- * with collection nodes as defined in the pubsub specification section <a href="http://xmpp.org/extensions/xep-0060.html#registrar-formtypes-config">16.4.3</a>.
+ * with collection nodes as defined in the PubSub specification section <a href="http://xmpp.org/extensions/xep-0060.html#registrar-formtypes-config">16.4.3</a>.
  * 
  * @author Robin Collier
  */
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/CollectionNode.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/CollectionNode.java
index 47260e6bb..867de52da 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/CollectionNode.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/CollectionNode.java
@@ -16,8 +16,8 @@
  */
 package org.jivesoftware.smackx.pubsub;
 
-public class CollectionNode extends Node
-{
+public class CollectionNode extends Node {
+
     CollectionNode(PubSubManager pubSubManager, String nodeId)
     {
         super(pubSubManager, nodeId);
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigurationEvent.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigurationEvent.java
index ef070cabb..73ee417de 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigurationEvent.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigurationEvent.java
@@ -23,7 +23,7 @@ import java.util.List;
 import org.jivesoftware.smack.packet.ExtensionElement;
 
 /**
- * Represents the <b>configuration</b> element of a pubsub message event which 
+ * Represents the <b>configuration</b> element of a PubSub message event which
  * associates a configuration form to the node which was configured.  The form 
  * contains the current node configuration.
  *  
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureForm.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureForm.java
index 4dd2979d7..18d661912 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureForm.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureForm.java
@@ -163,7 +163,7 @@ public class ConfigureForm extends Form
     public void setChildrenAssociationPolicy(ChildrenAssociationPolicy policy)
     {
         addField(ConfigureNodeFields.children_association_policy, FormField.Type.list_single);
-        List<String> values = new ArrayList<String>(1);
+        List<String> values = new ArrayList<>(1);
         values.add(policy.toString());
         setAnswer(ConfigureNodeFields.children_association_policy.getFieldName(), values);
     }
@@ -711,7 +711,7 @@ public class ConfigureForm extends Form
 
     private static List<String> getListSingle(String value)
     {
-        List<String> list = new ArrayList<String>(1);
+        List<String> list = new ArrayList<>(1);
         list.add(value);
         return list;
     }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElement.java
index 9d68db105..8a0ab03e6 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElement.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElement.java
@@ -26,7 +26,7 @@ import org.jivesoftware.smack.util.XmlStringBuilder;
 import org.jivesoftware.smackx.pubsub.packet.PubSubNamespace;
 
 /**
- * Represents the top level element of a pubsub event extension.  All types of pubsub events are
+ * Represents the top level element of a PubSub event extension.  All types of PubSub events are
  * represented by this class.  The specific type can be found by {@link #getEventType()}.  The 
  * embedded event information, which is specific to the event type, can be retrieved by the {@link #getEvent()}
  * method.
@@ -45,8 +45,8 @@ public class EventElement implements EmbeddedPacketExtension
      */
     public static final String NAMESPACE = PubSubNamespace.EVENT.getXmlns();
 
-    private EventElementType type;
-    private NodeExtension ext;
+    private final EventElementType type;
+    private final NodeExtension ext;
 
     public EventElement(EventElementType eventType, NodeExtension eventExt)
     {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElementType.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElementType.java
index 0850e7d92..5a4a6d589 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElementType.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElementType.java
@@ -17,14 +17,14 @@
 package org.jivesoftware.smackx.pubsub;
 
 /**
- * This enumeration defines the possible event types that are supported within pubsub
+ * This enumeration defines the possible event types that are supported within PubSub
  * event messages.
  * 
  * @author Robin Collier
  */
 public enum EventElementType
 {
-    /** A node has been associated or dissassociated with a collection node. */
+    /** A node has been associated or disassociated with a collection node. */
     collection,
 
     /** A node has had its configuration changed. */
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java
index 5940c6aaf..096ea896a 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smackx.pubsub;
 import org.jivesoftware.smackx.xdata.Form;
 
 /**
- * Generic stanza(/packet) extension which represents any pubsub form that is
+ * Generic stanza(/packet) extension which represents any PubSub form that is
  * parsed from the incoming stream or being sent out to the server.
  * 
  * Form types are defined in {@link FormNodeType}.
@@ -28,7 +28,7 @@ import org.jivesoftware.smackx.xdata.Form;
  */
 public class FormNode extends NodeExtension
 {
-    private Form configForm;
+    private final Form configForm;
 
     /**
      * Create a {@link FormNode} which contains the specified form.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNodeType.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNodeType.java
index c8bed54c4..38668bff7 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNodeType.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNodeType.java
@@ -21,12 +21,11 @@ import java.util.Locale;
 import org.jivesoftware.smackx.pubsub.packet.PubSubNamespace;
 
 /**
- * The types of forms supported by the pubsub specification.
+ * The types of forms supported by the PubSub specification.
  * 
  * @author Robin Collier
  */
-public enum FormNodeType
-{
+public enum FormNodeType {
     /** Form for configuring an existing node. */
     CONFIGURE_OWNER,
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Item.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Item.java
index 72b67600c..2d02a28f2 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Item.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Item.java
@@ -22,7 +22,7 @@ import org.jivesoftware.smackx.pubsub.provider.ItemProvider;
 
 /**
  * This class represents an item that has been, or will be published to a
- * pubsub node.  An <tt>Item</tt> has several properties that are dependent
+ * PubSub node.  An <tt>Item</tt> has several properties that are dependent
  * on the configuration of the node to which it has been or will be published.
  * 
  * <h3>An Item received from a node (via {@link LeafNode#getItems()} or {@link LeafNode#addItemEventListener(org.jivesoftware.smackx.pubsub.listener.ItemEventListener)}</h3>
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemReply.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemReply.java
index 3d39e82e5..1000ae042 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemReply.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemReply.java
@@ -28,5 +28,5 @@ public enum ItemReply
     owner,
 
     /** The item publisher. */
-    publisher;
+    publisher
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemsExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemsExtension.java
index 3d7153e09..f87447bd4 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemsExtension.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemsExtension.java
@@ -51,7 +51,7 @@ public class ItemsExtension extends NodeExtension implements EmbeddedPacketExten
         private final PubSubElementType elem;
         private final String att;
 
-        private ItemsElementType(PubSubElementType nodeElement, String attribute)
+        ItemsElementType(PubSubElementType nodeElement, String attribute)
         {
             elem = nodeElement;
             att = attribute;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java
index 9a5010320..0bdeaef48 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java
@@ -30,8 +30,8 @@ import org.jivesoftware.smackx.disco.packet.DiscoverItems;
 import org.jivesoftware.smackx.pubsub.packet.PubSub;
 
 /**
- * The main class for the majority of pubsub functionality.  In general
- * almost all pubsub capabilities are related to the concept of a node.
+ * The main class for the majority of PubSub functionality. In general
+ * almost all PubSub capabilities are related to the concept of a node.
  * All items are published to a node, and typically subscribed to by other
  * users.  These users then retrieve events based on this subscription.
  * 
@@ -73,7 +73,7 @@ public class LeafNode extends Node
      */
     public <T extends Item> List<T> getItems() throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException
     {
-        return getItems((List<ExtensionElement>) null, (List<ExtensionElement>) null);
+        return getItems((List<ExtensionElement>) null, null);
     }
 
     /**
@@ -112,7 +112,7 @@ public class LeafNode extends Node
      */
     public <T extends Item> List<T> getItems(Collection<String> ids) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException
     {
-        List<Item> itemList = new ArrayList<Item>(ids.size());
+        List<Item> itemList = new ArrayList<>(ids.size());
 
         for (String id : ids)
         {
@@ -320,7 +320,7 @@ public class LeafNode extends Node
     @SuppressWarnings("unchecked")
     public <T extends Item> void send(T item) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException
     {
-        Collection<T> items = new ArrayList<T>(1);
+        Collection<T> items = new ArrayList<>(1);
         items.add((item == null ? (T) new Item() : item));
         send(items);
     }
@@ -345,7 +345,7 @@ public class LeafNode extends Node
      */
     public <T extends Item> void send(Collection<T> items) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException
     {
-        PubSub packet = createPubsubPacket(Type.set, new PublishItem<T>(getId(), items));
+        PubSub packet = createPubsubPacket(Type.set, new PublishItem<>(getId(), items));
 
         pubSubManager.getConnection().createStanzaCollectorAndSend(packet).nextResultOrThrow();
     }
@@ -378,7 +378,7 @@ public class LeafNode extends Node
      */
     public void deleteItem(String itemId) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException
     {
-        Collection<String> items = new ArrayList<String>(1);
+        Collection<String> items = new ArrayList<>(1);
         items.add(itemId);
         deleteItem(items);
     }
@@ -394,7 +394,7 @@ public class LeafNode extends Node
      */
     public void deleteItem(Collection<String> itemIds) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException
     {
-        List<Item> items = new ArrayList<Item>(itemIds.size());
+        List<Item> items = new ArrayList<>(itemIds.size());
 
         for (String id : itemIds)
         {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
index d52267e97..72a1f6ec3 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
@@ -49,16 +49,16 @@ abstract public class Node
     protected final PubSubManager pubSubManager;
     protected final String id;
 
-    protected ConcurrentHashMap<ItemEventListener<Item>, StanzaListener> itemEventToListenerMap = new ConcurrentHashMap<ItemEventListener<Item>, StanzaListener>();
-    protected ConcurrentHashMap<ItemDeleteListener, StanzaListener> itemDeleteToListenerMap = new ConcurrentHashMap<ItemDeleteListener, StanzaListener>();
-    protected ConcurrentHashMap<NodeConfigListener, StanzaListener> configEventToListenerMap = new ConcurrentHashMap<NodeConfigListener, StanzaListener>();
+    protected ConcurrentHashMap<ItemEventListener<Item>, StanzaListener> itemEventToListenerMap = new ConcurrentHashMap<>();
+    protected ConcurrentHashMap<ItemDeleteListener, StanzaListener> itemDeleteToListenerMap = new ConcurrentHashMap<>();
+    protected ConcurrentHashMap<NodeConfigListener, StanzaListener> configEventToListenerMap = new ConcurrentHashMap<>();
 
     /**
      * Construct a node associated to the supplied connection with the specified 
      * node id.
      * 
-     * @param connection The connection the node is associated with
-     * @param nodeName The node id
+     * @param pubSubManager The PubSubManager for the connection the node is associated with
+     * @param nodeId The node id
      */
     Node(PubSubManager pubSubManager, String nodeId)
     {
@@ -220,7 +220,7 @@ abstract public class Node
         if (returnedExtensions != null) {
             returnedExtensions.addAll(reply.getExtensions());
         }
-        SubscriptionsExtension subElem = (SubscriptionsExtension) reply.getExtension(PubSubElementType.SUBSCRIPTIONS);
+        SubscriptionsExtension subElem = reply.getExtension(PubSubElementType.SUBSCRIPTIONS);
         return subElem.getSubscriptions();
     }
 
@@ -280,7 +280,7 @@ abstract public class Node
     /**
      * Retrieve the affiliation list for this node as owner.
      * <p>
-     * Note that this is an <b>optional</b> PubSub feature ('pubusb#modify-affiliations').
+     * Note that this is an <b>optional</b> PubSub feature ('pubsub#modify-affiliations').
      * </p>
      *
      * @param additionalExtensions optional additional extension elements add to the request.
@@ -314,7 +314,7 @@ abstract public class Node
         if (returnedExtensions != null) {
             returnedExtensions.addAll(reply.getExtensions());
         }
-        AffiliationsExtension affilElem = (AffiliationsExtension) reply.getExtension(PubSubElementType.AFFILIATIONS);
+        AffiliationsExtension affilElem = reply.getExtension(PubSubElementType.AFFILIATIONS);
         return affilElem.getAffiliations();
     }
 
@@ -322,7 +322,7 @@ abstract public class Node
      * Modify the affiliations for this PubSub node as owner. The {@link Affiliation}s given must be created with the
      * {@link Affiliation#Affiliation(org.jxmpp.jid.BareJid, Affiliation.Type)} constructor.
      * <p>
-     * Note that this is an <b>optional</b> PubSub feature ('pubusb#modify-affiliations').
+     * Note that this is an <b>optional</b> PubSub feature ('pubsub#modify-affiliations').
      * </p>
      * 
      * @param affiliations
@@ -574,12 +574,12 @@ abstract public class Node
 
     private static List<String> getSubscriptionIds(Stanza packet)
     {
-        HeadersExtension headers = (HeadersExtension) packet.getExtension("headers", "http://jabber.org/protocol/shim");
+        HeadersExtension headers = packet.getExtension("headers", "http://jabber.org/protocol/shim");
         List<String> values = null;
 
         if (headers != null)
         {
-            values = new ArrayList<String>(headers.getHeaders().size());
+            values = new ArrayList<>(headers.getHeaders().size());
 
             for (Header header : headers.getHeaders())
             {
@@ -598,7 +598,7 @@ abstract public class Node
     public class ItemEventTranslator implements StanzaListener
     {
         @SuppressWarnings("rawtypes")
-        private ItemEventListener listener;
+        private final ItemEventListener listener;
 
         public ItemEventTranslator(@SuppressWarnings("rawtypes") ItemEventListener eventListener)
         {
@@ -609,7 +609,7 @@ abstract public class Node
         @SuppressWarnings({ "rawtypes", "unchecked" })
         public void processStanza(Stanza packet)
         {
-            EventElement event = (EventElement) packet.getExtension("event", PubSubNamespace.EVENT.getXmlns());
+            EventElement event = packet.getExtension("event", PubSubNamespace.EVENT.getXmlns());
             ItemsExtension itemsElem = (ItemsExtension) event.getEvent();
             ItemPublishEvent eventItems = new ItemPublishEvent(itemsElem.getNode(), itemsElem.getItems(), getSubscriptionIds(packet), DelayInformationManager.getDelayTimestamp(packet));
             listener.handlePublishedItems(eventItems);
@@ -624,7 +624,7 @@ abstract public class Node
      */
     public class ItemDeleteTranslator implements StanzaListener
     {
-        private ItemDeleteListener listener;
+        private final ItemDeleteListener listener;
 
         public ItemDeleteTranslator(ItemDeleteListener eventListener)
         {
@@ -635,7 +635,7 @@ abstract public class Node
         public void processStanza(Stanza packet)
         {
 // CHECKSTYLE:OFF
-            EventElement event = (EventElement)packet.getExtension("event", PubSubNamespace.EVENT.getXmlns());
+            EventElement event = packet.getExtension("event", PubSubNamespace.EVENT.getXmlns());
 
             List<ExtensionElement> extList = event.getExtensions();
 
@@ -648,7 +648,7 @@ abstract public class Node
                 ItemsExtension itemsElem = (ItemsExtension)event.getEvent();
                 @SuppressWarnings("unchecked")
                 Collection<RetractItem> pubItems = (Collection<RetractItem>) itemsElem.getItems();
-                List<String> items = new ArrayList<String>(pubItems.size());
+                List<String> items = new ArrayList<>(pubItems.size());
 
                 for (RetractItem item : pubItems)
                 {
@@ -670,7 +670,7 @@ abstract public class Node
      */
     public static class NodeConfigTranslator implements StanzaListener
     {
-        private NodeConfigListener listener;
+        private final NodeConfigListener listener;
 
         public NodeConfigTranslator(NodeConfigListener eventListener)
         {
@@ -680,7 +680,7 @@ abstract public class Node
         @Override
         public void processStanza(Stanza packet)
         {
-            EventElement event = (EventElement) packet.getExtension("event", PubSubNamespace.EVENT.getXmlns());
+            EventElement event = packet.getExtension("event", PubSubNamespace.EVENT.getXmlns());
             ConfigurationEvent config = (ConfigurationEvent) event.getEvent();
 
             listener.handleNodeConfiguration(config);
@@ -704,9 +704,9 @@ abstract public class Node
             this(elementName, null);
         }
 
-        EventContentFilter(String firstLevelEelement, String secondLevelElement)
+        EventContentFilter(String firstLevelElement, String secondLevelElement)
         {
-            firstElement = firstLevelEelement;
+            firstElement = firstLevelElement;
             secondElement = secondLevelElement;
             allowEmpty = firstElement.equals(EventElementType.items.toString())
                             && "item".equals(secondLevelElement);
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeType.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeType.java
index 08146d5c4..35efd39a6 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeType.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeType.java
@@ -24,5 +24,5 @@ package org.jivesoftware.smackx.pubsub;
 public enum NodeType
 {
     leaf,
-    collection;
+    collection
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PayloadItem.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PayloadItem.java
index bba15fe96..1bd674ac4 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PayloadItem.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PayloadItem.java
@@ -50,7 +50,7 @@ import org.jivesoftware.smackx.pubsub.provider.ItemProvider;
  */
 public class PayloadItem<E extends ExtensionElement> extends Item
 {
-    private E payload;
+    private final E payload;
 
     /**
      * Create an <tt>Item</tt> with no id and a payload  The id will be set by the server.  
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubElementType.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubElementType.java
index c8feeac6b..f786681eb 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubElementType.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubElementType.java
@@ -54,7 +54,7 @@ public enum PubSubElementType
     private final String eName;
     private final PubSubNamespace nSpace;
 
-    private PubSubElementType(String elemName, PubSubNamespace ns)
+    PubSubElementType(String elemName, PubSubNamespace ns)
     {
         eName = elemName;
         nSpace = ns;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubFeature.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubFeature.java
index 6aae6ae95..bb9d10105 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubFeature.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubFeature.java
@@ -33,7 +33,7 @@ public enum PubSubFeature implements CharSequence {
     access_open(Support.optional),
     access_presence(Support.optional),
     access_roster(Support.optional),
-    acccess_whitelist(Support.optional),
+    access_whitelist(Support.optional),
     auto_create(Support.optional),
     auto_subscribe(Support.recommended),
     collections(Support.optional),
@@ -78,7 +78,7 @@ public enum PubSubFeature implements CharSequence {
     private final String qualifiedFeature;
     private final Feature.Support support;
 
-    private PubSubFeature(Feature.Support support) {
+    PubSubFeature(Feature.Support support) {
         this.feature = name().replace('_', '-');
         this.qualifiedFeature = PubSub.NAMESPACE + '#' + this.feature;
         this.support = support;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java
index 4a364c5a7..78f9b6c7b 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java
@@ -80,7 +80,7 @@ public final class PubSubManager extends Manager {
      * A map of node IDs to Nodes, used to cache those Nodes. This does only cache the type of Node,
      * i.e. {@link CollectionNode} or {@link LeafNode}.
      */
-    private final Map<String, Node> nodeMap = new ConcurrentHashMap<String, Node>();
+    private final Map<String, Node> nodeMap = new ConcurrentHashMap<>();
 
     /**
      * Get a PubSub manager for the default PubSub service of the connection.
@@ -98,7 +98,7 @@ public final class PubSubManager extends Manager {
                 LOGGER.log(Level.WARNING, "Could not determine PubSub service", e);
             }
             catch (InterruptedException e) {
-                LOGGER.log(Level.FINE, "Interupted while trying to determine PubSub service", e);
+                LOGGER.log(Level.FINE, "Interrupted while trying to determine PubSub service", e);
             }
         }
         if (pubSubService == null) {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishItem.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishItem.java
index 7229fb8a4..560906230 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishItem.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishItem.java
@@ -37,7 +37,7 @@ public class PublishItem<T extends Item> extends NodeExtension
     public PublishItem(String nodeId, T toPublish)
     {
         super(PubSubElementType.PUBLISH, nodeId);
-        items = new ArrayList<T>(1);
+        items = new ArrayList<>(1);
         items.add(toPublish);
     }
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishModel.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishModel.java
index 4e207ddb1..7342dcc6e 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishModel.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishModel.java
@@ -31,5 +31,5 @@ public enum PublishModel
     subscribers,
 
     /** Anyone may publish. */
-    open;
+    open
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/RetractItem.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/RetractItem.java
index 41e6fee02..2b8ff321f 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/RetractItem.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/RetractItem.java
@@ -27,7 +27,7 @@ import org.jivesoftware.smackx.pubsub.packet.PubSubNamespace;
  */
 public class RetractItem implements ExtensionElement
 {
-    private String id;
+    private final String id;
 
     /**
      * Construct a <tt>RetractItem</tt> with the specified id.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeForm.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeForm.java
index 0c07b4076..9d6cf1ccb 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeForm.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeForm.java
@@ -181,7 +181,7 @@ public class SubscribeForm extends Form
      */
     public List<PresenceState> getShowValues()
     {
-        ArrayList<PresenceState> result = new ArrayList<PresenceState>(5);
+        ArrayList<PresenceState> result = new ArrayList<>(5);
 
         for (String state : getFieldValues(SubscribeOptionFields.show_values))
         {
@@ -198,7 +198,7 @@ public class SubscribeForm extends Form
      */
     public void setShowValues(Collection<PresenceState> stateValues)
     {
-        ArrayList<String> values = new ArrayList<String>(stateValues.size());
+        ArrayList<String> values = new ArrayList<>(stateValues.size());
 
         for (PresenceState state : stateValues)
         {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSubNamespace.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSubNamespace.java
index 1dbeb336c..211c18111 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSubNamespace.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSubNamespace.java
@@ -24,8 +24,7 @@ import java.util.Locale;
  * 
  * @author Robin Collier
  */
-public enum PubSubNamespace
-{
+public enum PubSubNamespace {
     BASIC(null),
     ERROR("errors"),
     EVENT("event"),
@@ -34,13 +33,11 @@ public enum PubSubNamespace
     private final String fragment;
     private final String fullNamespace;
 
-    private PubSubNamespace(String fragment)
-    {
+    PubSubNamespace(String fragment) {
         this.fragment = fragment;
         if (fragment != null) {
             fullNamespace = PubSub.NAMESPACE + '#' + fragment;
-        }
-        else {
+        } else {
             fullNamespace = PubSub.NAMESPACE;
         }
     }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/FormNodeProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/FormNodeProvider.java
index a06d9b322..931b600d8 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/FormNodeProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/FormNodeProvider.java
@@ -28,7 +28,7 @@ import org.jivesoftware.smackx.xdata.Form;
 import org.jivesoftware.smackx.xdata.packet.DataForm;
 
 /**
- * Parses one of several elements used in pubsub that contain a form of some kind as a child element.  The
+ * Parses one of several elements used in PubSub that contain a form of some kind as a child element.  The
  * elements and namespaces supported is defined in {@link FormNodeType}.
  * 
  * @author Robin Collier
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java
index b552e1181..e40d63374 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java
@@ -59,11 +59,11 @@ public class ItemProvider extends ExtensionElementProvider<Item>
             if (extensionProvider == null)
             {
                 CharSequence payloadText = PacketParserUtils.parseElement(parser, true);
-                return new PayloadItem<SimplePayload>(id, node, new SimplePayload(payloadElemName, payloadNS, payloadText));
+                return new PayloadItem<>(id, node, new SimplePayload(payloadElemName, payloadNS, payloadText));
             }
             else
             {
-                return new PayloadItem<ExtensionElement>(id, node, extensionProvider.parse(parser));
+                return new PayloadItem<>(id, node, extensionProvider.parse(parser));
             }
         }
     }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/PubSubProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/PubSubProvider.java
index e8d6a1b56..1f5336783 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/PubSubProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/PubSubProvider.java
@@ -26,7 +26,7 @@ import org.jivesoftware.smackx.pubsub.packet.PubSubNamespace;
 import org.xmlpull.v1.XmlPullParser;
 
 /**
- * Parses the root pubsub stanza(/packet) extensions of the {@link IQ} stanza(/packet) and returns
+ * Parses the root PubSub stanza(/packet) extensions of the {@link IQ} stanza(/packet) and returns
  * a {@link PubSub} instance.
  * 
  * @author Robin Collier
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SimpleNodeProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SimpleNodeProvider.java
index fee3d1c61..aa8db0d9d 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SimpleNodeProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SimpleNodeProvider.java
@@ -26,8 +26,8 @@ import org.jivesoftware.smackx.pubsub.NodeExtension;
 import org.jivesoftware.smackx.pubsub.PubSubElementType;
 
 /**
- * Parses simple elements that only contain a <b>node</b> attribute.  This is common amongst many of the 
- * elements defined in the pubsub specification.  For this common case a {@link NodeExtension} is returned. 
+ * Parses simple elements that only contain a <b>node</b> attribute. This is common amongst many of the
+ * elements defined in the PubSub specification. For this common case a {@link NodeExtension} is returned.
  * 
  * @author Robin Collier
  */
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionProvider.java
index 87f39fae0..b18b30887 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionProvider.java
@@ -26,7 +26,7 @@ import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
 /**
- * Parses the <b>subscription</b> element out of the pubsub IQ message from 
+ * Parses the <b>subscription</b> element out of the PubSub IQ message from
  * the server as specified in the <a href="http://xmpp.org/extensions/xep-0060.html#schemas-pubsub">subscription schema</a>.
  * 
  * @author Robin Collier
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionsProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionsProvider.java
index 24950bd92..ab7852ad5 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionsProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionsProvider.java
@@ -26,7 +26,7 @@ import org.jivesoftware.smackx.pubsub.Subscription;
 import org.jivesoftware.smackx.pubsub.SubscriptionsExtension;
 
 /**
- * Parses the <b>subscriptions</b> element out of the pubsub IQ message from 
+ * Parses the <b>subscriptions</b> element out of the PubSub IQ message from
  * the server as specified in the <a href="http://xmpp.org/extensions/xep-0060.html#schemas-pubsub">subscriptions schema</a>.
  * 
  * @author Robin Collier
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java
index b95ebf834..7c18288bc 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java
@@ -74,14 +74,14 @@ import org.jxmpp.jid.Jid;
  */
 public final class DeliveryReceiptManager extends Manager {
 
-    private static final StanzaFilter MESSAGES_WITH_DEVLIERY_RECEIPT_REQUEST = new AndFilter(StanzaTypeFilter.MESSAGE,
+    private static final StanzaFilter MESSAGES_WITH_DELIVERY_RECEIPT_REQUEST = new AndFilter(StanzaTypeFilter.MESSAGE,
                     new StanzaExtensionFilter(new DeliveryReceiptRequest()));
     private static final StanzaFilter MESSAGES_WITH_DELIVERY_RECEIPT = new AndFilter(StanzaTypeFilter.MESSAGE,
                     new StanzaExtensionFilter(DeliveryReceipt.ELEMENT, DeliveryReceipt.NAMESPACE));
 
     private static final Logger LOGGER = Logger.getLogger(DeliveryReceiptManager.class.getName());
 
-    private static Map<XMPPConnection, DeliveryReceiptManager> instances = new WeakHashMap<XMPPConnection, DeliveryReceiptManager>();
+    private static final Map<XMPPConnection, DeliveryReceiptManager> instances = new WeakHashMap<>();
 
     static {
         XMPPConnectionRegistry.addConnectionCreationListener(new ConnectionCreationListener() {
@@ -175,7 +175,7 @@ public final class DeliveryReceiptManager extends Manager {
                 }
                 connection.sendStanza(ack);
             }
-        }, MESSAGES_WITH_DEVLIERY_RECEIPT_REQUEST);
+        }, MESSAGES_WITH_DELIVERY_RECEIPT_REQUEST);
     }
 
     /**
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/rsm/RSMManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/rsm/RSMManager.java
index 1906c9bbc..91b66a510 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/rsm/RSMManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/rsm/RSMManager.java
@@ -29,7 +29,7 @@ import org.jivesoftware.smackx.rsm.packet.RSMSet.PageDirection;
 public class RSMManager {
 
     Collection<ExtensionElement> page(int max) {
-        List<ExtensionElement> packetExtensions = new LinkedList<ExtensionElement>();
+        List<ExtensionElement> packetExtensions = new LinkedList<>();
         packetExtensions.add(new RSMSet(max));
         return packetExtensions;
     }
@@ -45,14 +45,14 @@ public class RSMManager {
             throw new IllegalArgumentException("returnedExtensions must no be null");
         }
         if (additionalExtensions == null) {
-            additionalExtensions = new LinkedList<ExtensionElement>();
+            additionalExtensions = new LinkedList<>();
         }
         RSMSet resultRsmSet = PacketUtil.extensionElementFrom(returnedExtensions, RSMSet.ELEMENT, RSMSet.NAMESPACE);
         if (resultRsmSet == null) {
             throw new IllegalArgumentException("returnedExtensions did not contain a RSMset");
         }
-        RSMSet continePageRsmSet = new RSMSet(max, resultRsmSet.getLast(), PageDirection.after);
-        additionalExtensions.add(continePageRsmSet);
+        RSMSet continuePageRsmSet = new RSMSet(max, resultRsmSet.getLast(), PageDirection.after);
+        additionalExtensions.add(continuePageRsmSet);
         return additionalExtensions;
     }
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/rsm/packet/RSMSet.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/rsm/packet/RSMSet.java
index 932f1f545..2c5861537 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/rsm/packet/RSMSet.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/rsm/packet/RSMSet.java
@@ -34,9 +34,9 @@ public class RSMSet implements ExtensionElement {
     private final String firstString;
     private final int firstIndex;
 
-    public static enum PageDirection {
+    public enum PageDirection {
         before,
-        after;
+        after
     }
 
     public RSMSet(int max) {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/search/ReportedData.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/search/ReportedData.java
index 11b4ca859..c2ec788bb 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/search/ReportedData.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/search/ReportedData.java
@@ -34,8 +34,8 @@ import org.jivesoftware.smackx.xdata.packet.DataForm.Item;
  */
 public class ReportedData {
 
-    private List<Column> columns = new ArrayList<Column>();
-    private List<Row> rows = new ArrayList<Row>();
+    private final List<Column> columns = new ArrayList<>();
+    private final List<Row> rows = new ArrayList<>();
     private String title = "";
 
     /**
@@ -70,13 +70,11 @@ public class ReportedData {
 
         // Add the rows to the report based on the form's items
         for (Item item : dataForm.getItems()) {
-            List<Field> fieldList = new ArrayList<Field>(columns.size());
+            List<Field> fieldList = new ArrayList<>(columns.size());
             for (FormField field : item.getFields()) {
                 // The field is created with all the values of the data form's field
-                List<String> values = new ArrayList<String>();
-                for (String value : field.getValues()) {
-                    values.add(value);
-                }
+                List<String> values = new ArrayList<>();
+                values.addAll(field.getValues());
                 fieldList.add(new Field(field.getVariable(), values));
             }
             rows.add(new Row(fieldList));
@@ -114,7 +112,7 @@ public class ReportedData {
      * @return a List of the rows returned from a search.
      */
     public List<Row> getRows() {
-        return Collections.unmodifiableList(new ArrayList<Row>(rows));
+        return Collections.unmodifiableList(new ArrayList<>(rows));
     }
 
     /**
@@ -123,7 +121,7 @@ public class ReportedData {
      * @return a List of the columns returned from a search.
      */
     public List<Column> getColumns() {
-        return Collections.unmodifiableList(new ArrayList<Column>(columns));
+        return Collections.unmodifiableList(new ArrayList<>(columns));
     }
 
 
@@ -194,7 +192,7 @@ public class ReportedData {
     }
 
     public static class Row {
-        private List<Field> fields = new ArrayList<Field>();
+        private List<Field> fields = new ArrayList<>();
 
         public Row(List<Field> fields) {
             this.fields = fields;
@@ -221,13 +219,13 @@ public class ReportedData {
          * @return the fields that define the data that goes with the item.
          */
         private List<Field> getFields() {
-            return Collections.unmodifiableList(new ArrayList<Field>(fields));
+            return Collections.unmodifiableList(new ArrayList<>(fields));
         }
     }
 
     public static class Field {
-        private String variable;
-        private List<String> values;
+        private final String variable;
+        private final List<String> values;
 
         public Field(String variable, List<String> values) {
             this.variable = variable;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java
index 25ec78050..ad63e14aa 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java
@@ -99,11 +99,11 @@ class SimpleUserSearch extends IQ {
 
         boolean done = false;
 
-        List<ReportedData.Field> fields = new ArrayList<ReportedData.Field>();
+        List<ReportedData.Field> fields = new ArrayList<>();
         while (!done) {
             if (parser.getAttributeCount() > 0) {
                 String jid = parser.getAttributeValue("", "jid");
-                List<String> valueList = new ArrayList<String>();
+                List<String> valueList = new ArrayList<>();
                 valueList.add(jid);
                 ReportedData.Field field = new ReportedData.Field("jid", valueList);
                 fields.add(field);
@@ -112,7 +112,7 @@ class SimpleUserSearch extends IQ {
             int eventType = parser.next();
 
             if (eventType == XmlPullParser.START_TAG && parser.getName().equals("item")) {
-                fields = new ArrayList<ReportedData.Field>();
+                fields = new ArrayList<>();
             }
             else if (eventType == XmlPullParser.END_TAG && parser.getName().equals("item")) {
                 ReportedData.Row row = new ReportedData.Row(fields);
@@ -122,7 +122,7 @@ class SimpleUserSearch extends IQ {
                 String name = parser.getName();
                 String value = parser.nextText();
 
-                List<String> valueList = new ArrayList<String>();
+                List<String> valueList = new ArrayList<>();
                 valueList.add(value);
                 ReportedData.Field field = new ReportedData.Field(name, valueList);
                 fields.add(field);
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java
index 76c5ddfd1..decef6b00 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java
@@ -70,7 +70,7 @@ public class UserSearch extends SimpleIQ {
         search.setType(IQ.Type.get);
         search.setTo(searchService);
 
-        IQ response = (IQ) con.createStanzaCollectorAndSend(search).nextResultOrThrow();
+        IQ response = con.createStanzaCollectorAndSend(search).nextResultOrThrow();
         return Form.getFormFrom(response);
     }
 
@@ -92,7 +92,7 @@ public class UserSearch extends SimpleIQ {
         search.setTo(searchService);
         search.addExtension(searchForm.getDataFormToSend());
 
-        IQ response = (IQ) con.createStanzaCollectorAndSend(search).nextResultOrThrow();
+        IQ response = con.createStanzaCollectorAndSend(search).nextResultOrThrow();
         return ReportedData.getReportedDataFrom(response);
     }
 
@@ -114,7 +114,7 @@ public class UserSearch extends SimpleIQ {
         search.setType(IQ.Type.set);
         search.setTo(searchService);
 
-        SimpleUserSearch response = (SimpleUserSearch) con.createStanzaCollectorAndSend(search).nextResultOrThrow();
+        SimpleUserSearch response = con.createStanzaCollectorAndSend(search).nextResultOrThrow();
         return response.getReportedData();
     }
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearchManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearchManager.java
index 9d70bf22d..35d09f8c9 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearchManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearchManager.java
@@ -48,8 +48,8 @@ import org.jxmpp.jid.DomainBareJid;
  */
 public class UserSearchManager {
 
-    private XMPPConnection con;
-    private UserSearch userSearch;
+    private final XMPPConnection con;
+    private final UserSearch userSearch;
 
     /**
      * Creates a new UserSearchManager.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/SharedGroupManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/SharedGroupManager.java
index 0859e435b..14a959018 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/SharedGroupManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/SharedGroupManager.java
@@ -52,7 +52,7 @@ public class SharedGroupManager {
         SharedGroupsInfo info = new SharedGroupsInfo();
         info.setType(IQ.Type.get);
 
-        SharedGroupsInfo result = (SharedGroupsInfo) connection.createStanzaCollectorAndSend(info).nextResultOrThrow();
+        SharedGroupsInfo result = connection.createStanzaCollectorAndSend(info).nextResultOrThrow();
         return result.getGroups();
     }
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/packet/SharedGroupsInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/packet/SharedGroupsInfo.java
index da1c59764..249c26a5c 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/packet/SharedGroupsInfo.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/packet/SharedGroupsInfo.java
@@ -40,7 +40,7 @@ public class SharedGroupsInfo extends IQ {
     public static final String ELEMENT = "sharedgroup";
     public static final String NAMESPACE = "http://www.jivesoftware.org/protocol/sharedgroup";
 
-    private List<String> groups = new ArrayList<String>();
+    private final List<String> groups = new ArrayList<>();
 
     public SharedGroupsInfo() {
         super(ELEMENT, NAMESPACE);
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/si/packet/StreamInitiation.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/si/packet/StreamInitiation.java
index bc138e889..4a11bf22e 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/si/packet/StreamInitiation.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/si/packet/StreamInitiation.java
@@ -78,7 +78,7 @@ public class StreamInitiation extends IQ {
      * listed at <http://www.iana.org/assignments/media-types>). During
      * negotiation, this attribute SHOULD be present, and is otherwise not
      * required. If not included during negotiation, its value is assumed to be
-     * "binary/octect-stream".
+     * "binary/octet-stream".
      *
      * @param mimeType The valid mime-type.
      */
@@ -87,7 +87,7 @@ public class StreamInitiation extends IQ {
     }
 
     /**
-     * Identifies the type of file that is desired to be transfered.
+     * Identifies the type of file that is desired to be transferred.
      *
      * @return The mime-type.
      * @see #setMimeType(String)
@@ -98,7 +98,7 @@ public class StreamInitiation extends IQ {
 
     /**
      * Sets the file which contains the information pertaining to the file to be
-     * transfered.
+     * transferred.
      *
      * @param file The file identified by the stream initiator to be sent.
      */
@@ -116,7 +116,7 @@ public class StreamInitiation extends IQ {
     }
 
     /**
-     * Sets the data form which contains the valid methods of stream neotiation
+     * Sets the data form which contains the valid methods of stream negotiation
      * and transfer.
      *
      * @param form The dataform containing the methods.
@@ -127,10 +127,10 @@ public class StreamInitiation extends IQ {
 
     /**
      * Returns the data form which contains the valid methods of stream
-     * neotiation and transfer.
+     * negotiation and transfer.
      *
      * @return Returns the data form which contains the valid methods of stream
-     *         neotiation and transfer.
+     *         negotiation and transfer.
      */
     public DataForm getFeatureNegotiationForm() {
         return featureNegotiation.getData();
@@ -283,7 +283,7 @@ public class StreamInitiation extends IQ {
         /**
          * Sets the description of the file.
          *
-         * @param desc The description of the file so that the file reciever can
+         * @param desc The description of the file so that the file receiver can
          *             know what file it is.
          */
         public void setDesc(final String desc) {
@@ -310,10 +310,10 @@ public class StreamInitiation extends IQ {
 
         /**
          * Returns whether or not the initiator can support a range for the file
-         * tranfer.
+         * transfer.
          *
          * @return Returns whether or not the initiator can support a range for
-         *         the file tranfer.
+         *         the file transfer.
          */
         public boolean isRanged() {
             return isRanged;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/time/EntityTimeManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/time/EntityTimeManager.java
index 96cde4caf..409d098da 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/time/EntityTimeManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/time/EntityTimeManager.java
@@ -39,7 +39,7 @@ import org.jxmpp.jid.Jid;
 
 public final class EntityTimeManager extends Manager {
 
-    private static final Map<XMPPConnection, EntityTimeManager> INSTANCES = new WeakHashMap<XMPPConnection, EntityTimeManager>();
+    private static final Map<XMPPConnection, EntityTimeManager> INSTANCES = new WeakHashMap<>();
 
     private static boolean autoEnable = true;
 
@@ -113,7 +113,6 @@ public final class EntityTimeManager extends Manager {
         Time request = new Time();
         // TODO Add Time(Jid) constructor and use this constructor instead
         request.setTo(jid);
-        Time response = (Time) connection().createStanzaCollectorAndSend(request).nextResultOrThrow();
-        return response;
+        return connection().createStanzaCollectorAndSend(request).nextResultOrThrow();
     }
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java
index c153c16da..c65ae7101 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java
@@ -96,16 +96,16 @@ public class VCard extends IQ {
      * Phone types:
      * VOICE?, FAX?, PAGER?, MSG?, CELL?, VIDEO?, BBS?, MODEM?, ISDN?, PCS?, PREF?
      */
-    private Map<String, String> homePhones = new HashMap<String, String>();
-    private Map<String, String> workPhones = new HashMap<String, String>();
+    private final Map<String, String> homePhones = new HashMap<>();
+    private final Map<String, String> workPhones = new HashMap<>();
 
     /**
      * Address types:
      * POSTAL?, PARCEL?, (DOM | INTL)?, PREF?, POBOX?, EXTADR?, STREET?, LOCALITY?,
      * REGION?, PCODE?, CTRY?
      */
-    private Map<String, String> homeAddr = new HashMap<String, String>();
-    private Map<String, String> workAddr = new HashMap<String, String>();
+    private final Map<String, String> homeAddr = new HashMap<>();
+    private final Map<String, String> workAddr = new HashMap<>();
 
     private String firstName;
     private String lastName;
@@ -125,10 +125,10 @@ public class VCard extends IQ {
     /**
      * Such as DESC ROLE GEO etc.. see XEP-0054
      */
-    private Map<String, String> otherSimpleFields = new HashMap<String, String>();
+    private final Map<String, String> otherSimpleFields = new HashMap<>();
 
     // fields that, as they are should not be escaped before forwarding to the server
-    private Map<String, String> otherUnescapableFields = new HashMap<String, String>();
+    private final Map<String, String> otherUnescapableFields = new HashMap<>();
 
     public VCard() {
         super(ELEMENT, NAMESPACE);
@@ -156,7 +156,7 @@ public class VCard extends IQ {
     }
 
     /**
-     * Set generic, unescapable VCard field. If unescabale is set to true, XML maybe a part of the
+     * Set generic, unescapable VCard field. If unescapable is set to true, XML maybe a part of the
      * value.
      *
      * @param value         value of field
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java
index 990f6ec38..39e639304 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java
@@ -413,7 +413,7 @@ public class Form {
      */
     public void setInstructions(String instructions) {
         // Split the instructions into multiple instructions for each existent newline
-        ArrayList<String> instructionsList = new ArrayList<String>();
+        ArrayList<String> instructionsList = new ArrayList<>();
         StringTokenizer st = new StringTokenizer(instructions, "\n");
         while (st.hasMoreTokens()) {
             instructionsList.add(st.nextToken());
@@ -504,10 +504,8 @@ public class Form {
                 if (field.getType() == FormField.Type.hidden) {
                     // Since a hidden field could have many values we need to collect them 
                     // in a list
-                    List<String> values = new ArrayList<String>();
-                    for (String value : field.getValues()) {
-                        values.add(value);
-                    }
+                    List<String> values = new ArrayList<>();
+                    values.addAll(field.getValues());
                     form.setAnswer(field.getVariable(), values);
                 }
             }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java
index 34ed2a28a..c01ad2088 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java
@@ -141,8 +141,8 @@ public class FormField implements NamedElement {
     private boolean required = false;
     private String label;
     private Type type;
-    private final List<Option> options = new ArrayList<Option>();
-    private final List<String> values = new ArrayList<String>();
+    private final List<Option> options = new ArrayList<>();
+    private final List<String> values = new ArrayList<>();
     private ValidateElement validateElement;
 
     /**
@@ -196,7 +196,7 @@ public class FormField implements NamedElement {
      */
     public List<Option> getOptions() {
         synchronized (options) {
-            return Collections.unmodifiableList(new ArrayList<Option>(options));
+            return Collections.unmodifiableList(new ArrayList<>(options));
         }
     }
 
@@ -228,7 +228,7 @@ public class FormField implements NamedElement {
      */
     public List<String> getValues() {
         synchronized (values) {
-            return Collections.unmodifiableList(new ArrayList<String>(values));
+            return Collections.unmodifiableList(new ArrayList<>(values));
         }
     }
 
@@ -344,7 +344,7 @@ public class FormField implements NamedElement {
      */
     protected void resetValues() {
         synchronized (values) {
-            values.removeAll(new ArrayList<String>(values));
+            values.removeAll(new ArrayList<>(values));
         }
     }
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java
index dfbc877c9..9e34c75dd 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java
@@ -73,9 +73,9 @@ public class DataForm implements ExtensionElement {
     private String title;
     private final List<String> instructions = new ArrayList<>();
     private ReportedData reportedData;
-    private final List<Item> items = new ArrayList<Item>();
+    private final List<Item> items = new ArrayList<>();
     private final Map<String, FormField> fields = new LinkedHashMap<>();
-    private final List<Element> extensionElements = new ArrayList<Element>();
+    private final List<Element> extensionElements = new ArrayList<>();
 
     public DataForm(Type type) {
         this.type = type;
@@ -111,7 +111,7 @@ public class DataForm implements ExtensionElement {
      */
     public List<String> getInstructions() {
         synchronized (instructions) {
-            return Collections.unmodifiableList(new ArrayList<String>(instructions));
+            return Collections.unmodifiableList(new ArrayList<>(instructions));
         }
     }
 
@@ -131,7 +131,7 @@ public class DataForm implements ExtensionElement {
      */
     public List<Item> getItems() {
         synchronized (items) {
-            return Collections.unmodifiableList(new ArrayList<Item>(items));
+            return Collections.unmodifiableList(new ArrayList<>(items));
         }
     }
 
@@ -338,7 +338,7 @@ public class DataForm implements ExtensionElement {
     public static class ReportedData {
         public static final String ELEMENT = "reported";
 
-        private List<FormField> fields = new ArrayList<FormField>();
+        private List<FormField> fields = new ArrayList<>();
 
         public ReportedData(List<FormField> fields) {
             this.fields = fields;
@@ -350,7 +350,7 @@ public class DataForm implements ExtensionElement {
          * @return the fields returned from a search.
          */
         public List<FormField> getFields() {
-            return Collections.unmodifiableList(new ArrayList<FormField>(fields));
+            return Collections.unmodifiableList(new ArrayList<>(fields));
         }
 
         public CharSequence toXML() {
@@ -374,7 +374,7 @@ public class DataForm implements ExtensionElement {
     public static class Item {
         public static final String ELEMENT = "item";
 
-        private List<FormField> fields = new ArrayList<FormField>();
+        private List<FormField> fields = new ArrayList<>();
 
         public Item(List<FormField> fields) {
             this.fields = fields;
@@ -386,7 +386,7 @@ public class DataForm implements ExtensionElement {
          * @return the fields that define the data that goes with the item.
          */
         public List<FormField> getFields() {
-            return Collections.unmodifiableList(new ArrayList<FormField>(fields));
+            return Collections.unmodifiableList(new ArrayList<>(fields));
         }
 
         public CharSequence toXML() {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/DataFormProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/DataFormProvider.java
index 77276ed68..d884c4bfb 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/DataFormProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/DataFormProvider.java
@@ -148,7 +148,7 @@ public class DataFormProvider extends ExtensionElementProvider<DataForm> {
 
     private static DataForm.Item parseItem(XmlPullParser parser) throws XmlPullParserException, IOException {
         final int initialDepth = parser.getDepth();
-        List<FormField> fields = new ArrayList<FormField>();
+        List<FormField> fields = new ArrayList<>();
         outerloop: while (true) {
             int eventType = parser.next();
             switch (eventType) {
@@ -172,7 +172,7 @@ public class DataFormProvider extends ExtensionElementProvider<DataForm> {
 
     private static DataForm.ReportedData parseReported(XmlPullParser parser) throws XmlPullParserException, IOException {
         final int initialDepth = parser.getDepth();
-        List<FormField> fields = new ArrayList<FormField>();
+        List<FormField> fields = new ArrayList<>();
         outerloop: while (true) {
             int eventType = parser.next();
             switch (eventType) {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatalayout/packet/DataLayout.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatalayout/packet/DataLayout.java
index 346100eb8..0c0682c96 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatalayout/packet/DataLayout.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatalayout/packet/DataLayout.java
@@ -36,7 +36,7 @@ public class DataLayout implements ExtensionElement {
     public static final String ELEMENT = "page";
     public static final String NAMESPACE = "http://jabber.org/protocol/xdata-layout";
 
-    private final List<DataFormLayoutElement> pageLayout = new ArrayList<DataFormLayoutElement>();
+    private final List<DataFormLayoutElement> pageLayout = new ArrayList<>();
     private final String label;
 
     /**
@@ -103,7 +103,7 @@ public class DataLayout implements ExtensionElement {
 
     /**
      * @param buf
-     * @param pageLayout2
+     * @param pageLayout
      */
     private static void walkList(XmlStringBuilder buf, List<DataFormLayoutElement> pageLayout) {
         for (DataFormLayoutElement object : pageLayout) {
@@ -151,7 +151,7 @@ public class DataLayout implements ExtensionElement {
     public static class Section implements DataFormLayoutElement{
 
         public static final String ELEMENT = "section";
-        private final List<DataFormLayoutElement> sectionLayout = new ArrayList<DataFormLayoutElement>();
+        private final List<DataFormLayoutElement> sectionLayout = new ArrayList<>();
         private final String label;
 
         /**
@@ -262,7 +262,7 @@ public class DataLayout implements ExtensionElement {
 
     }
 
-    public static interface DataFormLayoutElement extends NamedElement {
+    public interface DataFormLayoutElement extends NamedElement {
     }
 
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLManager.java
index 8bcbc647d..b8e253397 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLManager.java
@@ -85,7 +85,7 @@ public class XHTMLManager {
     /**
      * Returns true if the message contains an XHTML extension.
      *
-     * @param message the message to check if contains an XHTML extentsion or not
+     * @param message the message to check if contains an XHTML extension or not
      * @return a boolean indicating whether the message is an XHTML message
      */
     public static boolean isXHTMLMessage(Message message) {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java
index cfb4a4f5f..79a712bc7 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java
@@ -99,7 +99,7 @@ public class XHTMLExtension implements ExtensionElement {
      */
     public List<CharSequence> getBodies() {
         synchronized (bodies) {
-            return Collections.unmodifiableList(new ArrayList<CharSequence>(bodies));
+            return Collections.unmodifiableList(new ArrayList<>(bodies));
         }
     }
 
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockContactsIQTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockContactsIQTest.java
index b1ed887ed..acf3e4926 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockContactsIQTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockContactsIQTest.java
@@ -31,10 +31,10 @@ import org.jxmpp.jid.impl.JidCreate;
 
 public class BlockContactsIQTest {
 
-    String blockContactIQExample = "<iq id='block1' type='set'>" + "<block xmlns='urn:xmpp:blocking'>"
+    private static final String blockContactIQExample = "<iq id='block1' type='set'>" + "<block xmlns='urn:xmpp:blocking'>"
             + "<item jid='romeo@montague.net'/>" + "<item jid='pepe@montague.net'/>" + "</block>" + "</iq>";
 
-    String blockContactPushIQExample = "<iq to='juliet@capulet.com/chamber' type='set' id='push1'>"
+    private static final String blockContactPushIQExample = "<iq to='juliet@capulet.com/chamber' type='set' id='push1'>"
             + "<block xmlns='urn:xmpp:blocking'>" + "<item jid='romeo@montague.net'/>"
             + "<item jid='pepe@montague.net'/>" + "</block>" + "</iq>";
 
@@ -52,7 +52,7 @@ public class BlockContactsIQTest {
 
     @Test
     public void checkBlockContactPushIQ() throws Exception {
-        IQ iq = (IQ) PacketParserUtils.parseStanza(blockContactPushIQExample);
+        IQ iq = PacketParserUtils.parseStanza(blockContactPushIQExample);
         BlockContactsIQ blockContactIQ = (BlockContactsIQ) iq;
         Assert.assertEquals(JidCreate.from("romeo@montague.net"), blockContactIQ.getJids().get(0));
         Assert.assertEquals(JidCreate.from("pepe@montague.net"), blockContactIQ.getJids().get(1));
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockedErrorExtensionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockedErrorExtensionTest.java
index 886ab0b78..36fa027c5 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockedErrorExtensionTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockedErrorExtensionTest.java
@@ -26,16 +26,16 @@ import org.junit.Test;
 
 public class BlockedErrorExtensionTest {
 
-    String messageWithoutError = "<message from='gardano@erlang-solutions.com' "
+    private static final String messageWithoutError = "<message from='gardano@erlang-solutions.com' "
             + "to='griveroa-inaka@erlang-solutions.com/9b7b3fce28742983' "
             + "type='normal' xml:lang='en' id='5x41G-120'>" + "</message>";
 
-    String messageWithError = "<message from='gardano@erlang-solutions.com' "
+    private static final String messageWithError = "<message from='gardano@erlang-solutions.com' "
             + "to='griveroa-inaka@erlang-solutions.com/9b7b3fce28742983' "
             + "type='error' xml:lang='en' id='5x41G-121'>" + "<error code='406' type='cancel'>"
             + "<not-acceptable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>" + "</error>" + "</message>";
 
-    String messageWithBlockedError = "<message from='gardano@erlang-solutions.com' "
+    private static final String messageWithBlockedError = "<message from='gardano@erlang-solutions.com' "
             + "to='griveroa-inaka@erlang-solutions.com/9b7b3fce28742983' "
             + "type='error' xml:lang='en' id='5x41G-122'>" + "<error code='406' type='cancel'>"
             + "<blocked xmlns='urn:xmpp:blocking:errors'/>"
@@ -43,13 +43,13 @@ public class BlockedErrorExtensionTest {
 
     @Test
     public void checkErrorHasBlockedExtension() throws Exception {
-        Message message1 = (Message) PacketParserUtils.parseStanza(messageWithoutError);
+        Message message1 = PacketParserUtils.parseStanza(messageWithoutError);
         Assert.assertFalse(BlockedErrorExtension.isInside(message1));
 
-        Message message2 = (Message) PacketParserUtils.parseStanza(messageWithError);
+        Message message2 = PacketParserUtils.parseStanza(messageWithError);
         Assert.assertFalse(BlockedErrorExtension.isInside(message2));
 
-        Message message3 = (Message) PacketParserUtils.parseStanza(messageWithBlockedError);
+        Message message3 = PacketParserUtils.parseStanza(messageWithBlockedError);
         Assert.assertTrue(BlockedErrorExtension.isInside(message3));
     }
 
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/GetBlockingListTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/GetBlockingListTest.java
index 70817558d..733be24d3 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/GetBlockingListTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/GetBlockingListTest.java
@@ -28,13 +28,13 @@ import org.jxmpp.jid.impl.JidCreate;
 
 public class GetBlockingListTest {
 
-    String getBlockingListIQExample = "<iq id='blocklist1' type='get'>"
+    private static final String getBlockingListIQExample = "<iq id='blocklist1' type='get'>"
             + "<blocklist xmlns='urn:xmpp:blocking'/>" + "</iq>";
 
-    String blockListIQExample = "<iq type='result' id='blocklist1'>" + "<blocklist xmlns='urn:xmpp:blocking'>"
+    private static final String blockListIQExample = "<iq type='result' id='blocklist1'>" + "<blocklist xmlns='urn:xmpp:blocking'>"
             + "<item jid='romeo@montague.net'/>" + "<item jid='iago@shakespeare.lit'/>" + "</blocklist>" + "</iq>";
 
-    String emptyBlockListIQExample = "<iq type='result' id='blocklist1'>" + "<blocklist xmlns='urn:xmpp:blocking'/>"
+    private static final String emptyBlockListIQExample = "<iq type='result' id='blocklist1'>" + "<blocklist xmlns='urn:xmpp:blocking'/>"
             + "</iq>";
 
     @Test
@@ -47,13 +47,13 @@ public class GetBlockingListTest {
 
     @Test
     public void checkBlockListIQ() throws Exception {
-        IQ iq = (IQ) PacketParserUtils.parseStanza(blockListIQExample);
+        IQ iq = PacketParserUtils.parseStanza(blockListIQExample);
         BlockListIQ blockListIQ = (BlockListIQ) iq;
         Assert.assertEquals(2, blockListIQ.getBlockedJids().size());
         Assert.assertEquals(JidCreate.from("romeo@montague.net"), blockListIQ.getBlockedJids().get(0));
         Assert.assertEquals(JidCreate.from("iago@shakespeare.lit"), blockListIQ.getBlockedJids().get(1));
 
-        IQ iq2 = (IQ) PacketParserUtils.parseStanza(emptyBlockListIQExample);
+        IQ iq2 = PacketParserUtils.parseStanza(emptyBlockListIQExample);
         BlockListIQ emptyBlockListIQ = (BlockListIQ) iq2;
         Assert.assertEquals(0, emptyBlockListIQ.getBlockedJids().size());
     }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/UnblockContactsIQTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/UnblockContactsIQTest.java
index 177febf50..04ff8eaf7 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/UnblockContactsIQTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/UnblockContactsIQTest.java
@@ -31,17 +31,17 @@ import org.jxmpp.jid.impl.JidCreate;
 
 public class UnblockContactsIQTest {
 
-    String unblockContactIQExample = "<iq id='unblock1' type='set'>" + "<unblock xmlns='urn:xmpp:blocking'>"
+    private static final String unblockContactIQExample = "<iq id='unblock1' type='set'>" + "<unblock xmlns='urn:xmpp:blocking'>"
             + "<item jid='romeo@montague.net'/>" + "<item jid='pepe@montague.net'/>" + "</unblock>" + "</iq>";
 
-    String unblockContactPushIQExample = "<iq to='juliet@capulet.com/chamber' type='set' id='push3'>"
+    private static final String unblockContactPushIQExample = "<iq to='juliet@capulet.com/chamber' type='set' id='push3'>"
             + "<unblock xmlns='urn:xmpp:blocking'>" + "<item jid='romeo@montague.net'/>"
             + "<item jid='pepe@montague.net'/>" + "</unblock>" + "</iq>";
 
-    String unblockAllIQExample = "<iq id='unblock2' type='set'>" + "<unblock xmlns='urn:xmpp:blocking'/>"
+    private static final String unblockAllIQExample = "<iq id='unblock2' type='set'>" + "<unblock xmlns='urn:xmpp:blocking'/>"
             + "</iq>";
 
-    String unblockAllPushIQExample = "<iq to='juliet@capulet.com/chamber' type='set' id='push5'>"
+    private static final String unblockAllPushIQExample = "<iq to='juliet@capulet.com/chamber' type='set' id='push5'>"
             + "<unblock xmlns='urn:xmpp:blocking'/>" + "</iq>";
 
     @Test
@@ -58,7 +58,7 @@ public class UnblockContactsIQTest {
 
     @Test
     public void checkUnblockContactPushIQ() throws Exception {
-        IQ iq = (IQ) PacketParserUtils.parseStanza(unblockContactPushIQExample);
+        IQ iq = PacketParserUtils.parseStanza(unblockContactPushIQExample);
         UnblockContactsIQ unblockContactIQ = (UnblockContactsIQ) iq;
         Assert.assertEquals(JidCreate.from("romeo@montague.net"), unblockContactIQ.getJids().get(0));
         Assert.assertEquals(JidCreate.from("pepe@montague.net"), unblockContactIQ.getJids().get(1));
@@ -73,7 +73,7 @@ public class UnblockContactsIQTest {
 
     @Test
     public void checkUnblockAllPushIQ() throws Exception {
-        IQ iq = (IQ) PacketParserUtils.parseStanza(unblockAllPushIQExample);
+        IQ iq = PacketParserUtils.parseStanza(unblockAllPushIQExample);
         UnblockContactsIQ unblockAllIQ = (UnblockContactsIQ) iq;
         Assert.assertNull(unblockAllIQ.getJids());
     }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bob/BoBIQTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bob/BoBIQTest.java
index 2f5ecf40a..04bcb8748 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bob/BoBIQTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bob/BoBIQTest.java
@@ -29,10 +29,10 @@ import org.jxmpp.jid.impl.JidCreate;
 
 public class BoBIQTest extends SmackTestSuite {
 
-    String sampleBoBIQRequest = "<iq to='ladymacbeth@shakespeare.lit/castle' id='sarasa' type='get'>"
+    private static final String sampleBoBIQRequest = "<iq to='ladymacbeth@shakespeare.lit/castle' id='sarasa' type='get'>"
             + "<data xmlns='urn:xmpp:bob' cid='sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org'/>" + "</iq>";
 
-    String sampleBoBIQResponse = "<iq to='doctor@shakespeare.lit/pda' id='sarasa' type='result'>"
+    private static final String sampleBoBIQResponse = "<iq to='doctor@shakespeare.lit/pda' id='sarasa' type='result'>"
             + "<data xmlns='urn:xmpp:bob' cid='sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org' "
             + "max-age='86400' type='image/png'>" + "c2FyYXNhZGUyMzU0ajI=" + "</data>" + "</iq>";
 
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java
index 9ec417394..2fb886b1c 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java
@@ -40,8 +40,8 @@ import org.powermock.reflect.Whitebox;
  */
 public class CloseListenerTest extends InitExtensions {
 
-    static final Jid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
-    static final Jid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
+    private static final Jid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
+    private static final Jid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
 
     /**
      * If a close request to an unknown session is received it should be replied
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java
index 8a45ba26c..2b3b27f1e 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java
@@ -41,8 +41,8 @@ import org.powermock.reflect.Whitebox;
  */
 public class DataListenerTest extends InitExtensions {
 
-    static final Jid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
-    static final Jid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
+    private static final Jid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
+    private static final Jid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
 
     /**
      * If a data stanza(/packet) of an unknown session is received it should be replied
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManagerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManagerTest.java
index a07cef38d..888476a4f 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManagerTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManagerTest.java
@@ -50,16 +50,16 @@ import org.jxmpp.jid.JidTestUtil;
 public class InBandBytestreamManagerTest extends InitExtensions {
 
     // settings
-    static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
-    static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
-    static final DomainBareJid xmppServer = JidTestUtil.DOMAIN_BARE_JID_1;
+    private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
+    private static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
+    private static final DomainBareJid xmppServer = JidTestUtil.DOMAIN_BARE_JID_1;
     String sessionID = "session_id";
 
     // protocol verifier
-    Protocol protocol;
+    private Protocol protocol;
 
     // mocked XMPP connection
-    XMPPConnection connection;
+    private XMPPConnection connection;
 
     /**
      * Initialize fields used in the tests.
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java
index 8560d6e5a..572bb2c79 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java
@@ -42,13 +42,13 @@ import org.mockito.ArgumentCaptor;
  */
 public class InBandBytestreamRequestTest extends InitExtensions {
 
-    static final Jid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
-    static final Jid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
-    String sessionID = "session_id";
+    private static final Jid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
+    private static final Jid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
+    private String sessionID = "session_id";
 
-    XMPPConnection connection;
-    InBandBytestreamManager byteStreamManager;
-    Open initBytestream;
+    private XMPPConnection connection;
+    private InBandBytestreamManager byteStreamManager;
+    private Open initBytestream;
 
     /**
      * Initialize fields used in the tests.
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java
index 70ad647e3..7ea7e00ca 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java
@@ -58,24 +58,24 @@ import org.powermock.reflect.Whitebox;
 public class InBandBytestreamSessionMessageTest extends InitExtensions {
 
     // settings
-    static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
-    static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
-    static final DomainBareJid xmppServer = JidTestUtil.DOMAIN_BARE_JID_1;
-    String sessionID = "session_id";
+    private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
+    private static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
+    private static final DomainBareJid xmppServer = JidTestUtil.DOMAIN_BARE_JID_1;
+    private static final String sessionID = "session_id";
 
-    int blockSize = 10;
+    private static final int blockSize = 10;
 
     // protocol verifier
-    Protocol protocol;
+    private Protocol protocol;
 
     // mocked XMPP connection
-    XMPPConnection connection;
+    private XMPPConnection connection;
 
-    InBandBytestreamManager byteStreamManager;
+    private InBandBytestreamManager byteStreamManager;
 
-    Open initBytestream;
+    private Open initBytestream;
 
-    Verification<Message, IQ> incrementingSequence;
+    private Verification<Message, IQ> incrementingSequence;
 
     /**
      * Initialize fields used in the tests.
@@ -106,7 +106,7 @@ public class InBandBytestreamSessionMessageTest extends InitExtensions {
 
             @Override
             public void verify(Message request, IQ response) {
-                DataPacketExtension dpe = (DataPacketExtension) request.getExtension(
+                DataPacketExtension dpe = request.getExtension(
                                 DataPacketExtension.ELEMENT, DataPacketExtension.NAMESPACE);
                 assertEquals(lastSeq++, dpe.getSeq());
             }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java
index c1900346c..1f5a64833 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java
@@ -59,24 +59,24 @@ import org.powermock.reflect.Whitebox;
 public class InBandBytestreamSessionTest extends InitExtensions {
 
     // settings
-    static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
-    static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
-    static final DomainBareJid xmppServer = JidTestUtil.DOMAIN_BARE_JID_1;
-    String sessionID = "session_id";
+    private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
+    private static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
+    private static final DomainBareJid xmppServer = JidTestUtil.DOMAIN_BARE_JID_1;
+    private static final String sessionID = "session_id";
 
-    int blockSize = 10;
+    private static final int blockSize = 10;
 
     // protocol verifier
-    Protocol protocol;
+    private Protocol protocol;
 
     // mocked XMPP connection
-    XMPPConnection connection;
+    private XMPPConnection connection;
 
-    InBandBytestreamManager byteStreamManager;
+    private InBandBytestreamManager byteStreamManager;
 
-    Open initBytestream;
+    private Open initBytestream;
 
-    Verification<Data, IQ> incrementingSequence;
+    private Verification<Data, IQ> incrementingSequence;
 
     /**
      * Initialize fields used in the tests.
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java
index a509e9d49..c91f09960 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java
@@ -44,14 +44,14 @@ import org.powermock.reflect.Whitebox;
  */
 public class InitiationListenerTest extends InitExtensions {
 
-    static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
-    static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
-    String sessionID = "session_id";
+    private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
+    private static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
+    private static final String sessionID = "session_id";
 
-    XMPPConnection connection;
-    InBandBytestreamManager byteStreamManager;
-    InitiationListener initiationListener;
-    Open initBytestream;
+    private XMPPConnection connection;
+    private InBandBytestreamManager byteStreamManager;
+    private InitiationListener initiationListener;
+    private Open initBytestream;
 
     /**
      * Initialize fields used in the tests.
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java
index 50069f7ea..901d5bc8f 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java
@@ -58,7 +58,7 @@ public class CloseTest extends InitExtensions {
         assertEquals("sessionID", close.getSessionID());
     }
 
-    private static Properties outputProperties = new Properties();
+    private static final Properties outputProperties = new Properties();
     {
         outputProperties.put(javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION, "yes");
     }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java
index 31e1dec61..75c13849b 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java
@@ -81,7 +81,7 @@ public class DataPacketExtensionTest extends InitExtensions {
         assertNull(data.getDecodedData());
     }
 
-    private static Properties outputProperties = new Properties();
+    private static final Properties outputProperties = new Properties();
     {
         outputProperties.put(javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION, "yes");
     }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java
index 94c97055b..1a05c0ea9 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java
@@ -50,7 +50,7 @@ public class DataTest extends InitExtensions {
         assertEquals(IQ.Type.set, data.getType());
     }
 
-    private static Properties outputProperties = new Properties();
+    private static final Properties outputProperties = new Properties();
     {
         outputProperties.put(javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION, "yes");
     }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java
index 787760d6c..e74990bb5 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java
@@ -78,7 +78,7 @@ public class OpenTest extends InitExtensions {
         assertEquals(StanzaType.MESSAGE, open.getStanza());
     }
 
-    private static Properties outputProperties = new Properties();
+    private static final Properties outputProperties = new Properties();
     {
         outputProperties.put(javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION, "yes");
     }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java
index 969221720..bcc22e1ee 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java
@@ -39,7 +39,7 @@ import org.xmlpull.v1.XmlPullParserFactory;
  */
 public class OpenIQProviderTest extends InitExtensions {
 
-    private static Properties outputProperties = new Properties();
+    private static final Properties outputProperties = new Properties();
     {
         outputProperties.put(javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION, "yes");
     }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java
index 069d2679a..b70acfc4a 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java
@@ -46,19 +46,19 @@ import org.powermock.reflect.Whitebox;
  */
 public class InitiationListenerTest {
 
-    private final int TIMEOUT = 10000;
+    private static final int TIMEOUT = 10000;
 
-    static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
-    static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
-    static final DomainBareJid xmppServer = JidTestUtil.DOMAIN_BARE_JID_1;
-    static final DomainBareJid proxyJID = JidTestUtil.MUC_EXAMPLE_ORG;
-    String proxyAddress = "127.0.0.1";
-    String sessionID = "session_id";
+    private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
+    private static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
+    private static final DomainBareJid xmppServer = JidTestUtil.DOMAIN_BARE_JID_1;
+    private static final DomainBareJid proxyJID = JidTestUtil.MUC_EXAMPLE_ORG;
+    private static final String proxyAddress = "127.0.0.1";
+    private static final String sessionID = "session_id";
 
-    XMPPConnection connection;
-    Socks5BytestreamManager byteStreamManager;
-    InitiationListener initiationListener;
-    Bytestream initBytestream;
+    private XMPPConnection connection;
+    private Socks5BytestreamManager byteStreamManager;
+    private InitiationListener initiationListener;
+    private Bytestream initBytestream;
 
     /**
      * Initialize fields used in the tests.
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java
index 1ee614d5f..50a0ee505 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java
@@ -66,18 +66,18 @@ import org.jxmpp.stringprep.XmppStringprepException;
 public class Socks5ByteStreamManagerTest {
 
     // settings
-    static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
-    static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
-    static final DomainBareJid xmppServer = JidTestUtil.DOMAIN_BARE_JID_1;
-    static final DomainBareJid proxyJID = JidTestUtil.MUC_EXAMPLE_ORG;
-    String proxyAddress = "127.0.0.1";
-    String sessionID = "session_id";
+    private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
+    private static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
+    private static final DomainBareJid xmppServer = JidTestUtil.DOMAIN_BARE_JID_1;
+    private static final DomainBareJid proxyJID = JidTestUtil.MUC_EXAMPLE_ORG;
+    private static final String proxyAddress = "127.0.0.1";
+    private static final String sessionID = "session_id";
 
     // protocol verifier
-    Protocol protocol;
+    private Protocol protocol;
 
     // mocked XMPP connection
-    XMPPConnection connection;
+    private XMPPConnection connection;
 
     /**
      * Initialize fields used in the tests.
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java
index 60db3ced3..b21ca8758 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java
@@ -55,16 +55,16 @@ import org.jxmpp.jid.impl.JidCreate;
 public class Socks5ByteStreamRequestTest {
 
     // settings
-    static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
-    static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
-    static final DomainBareJid xmppServer = JidTestUtil.DOMAIN_BARE_JID_1;
-    static final DomainBareJid proxyJID = JidTestUtil.MUC_EXAMPLE_ORG;
-    String proxyAddress = "127.0.0.1";
-    String sessionID = "session_id";
+    private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
+    private static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
+    private static final DomainBareJid xmppServer = JidTestUtil.DOMAIN_BARE_JID_1;
+    private static final DomainBareJid proxyJID = JidTestUtil.MUC_EXAMPLE_ORG;
+    private static final String proxyAddress = "127.0.0.1";
+    private static final String sessionID = "session_id";
 
-    Protocol protocol;
+    private Protocol protocol;
 
-    XMPPConnection connection;
+    private XMPPConnection connection;
 
     /**
      * Initialize fields used in the tests.
@@ -121,7 +121,7 @@ public class Socks5ByteStreamRequestTest {
         assertEquals(initiatorJID, targetResponse.getTo());
         assertEquals(IQ.Type.error, ((IQ) targetResponse).getType());
         assertEquals(XMPPError.Condition.item_not_found,
-                        ((IQ) targetResponse).getError().getCondition());
+                        targetResponse.getError().getCondition());
 
     }
 
@@ -165,7 +165,7 @@ public class Socks5ByteStreamRequestTest {
         assertEquals(initiatorJID, targetResponse.getTo());
         assertEquals(IQ.Type.error, ((IQ) targetResponse).getType());
         assertEquals(XMPPError.Condition.item_not_found,
-                        ((IQ) targetResponse).getError().getCondition());
+                        targetResponse.getError().getCondition());
 
     }
 
@@ -213,7 +213,7 @@ public class Socks5ByteStreamRequestTest {
             assertEquals(initiatorJID, targetResponse.getTo());
             assertEquals(IQ.Type.error, ((IQ) targetResponse).getType());
             assertEquals(XMPPError.Condition.item_not_found,
-                            ((IQ) targetResponse).getError().getCondition());
+                            targetResponse.getError().getCondition());
         }
 
         // create test data for stream
@@ -305,7 +305,7 @@ public class Socks5ByteStreamRequestTest {
             assertEquals(initiatorJID, targetResponse.getTo());
             assertEquals(IQ.Type.error, ((IQ) targetResponse).getType());
             assertEquals(XMPPError.Condition.item_not_found,
-                            ((IQ) targetResponse).getError().getCondition());
+                            targetResponse.getError().getCondition());
         }
 
         // enable blacklisting
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java
index f22b95ee6..54259cd3b 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java
@@ -56,22 +56,22 @@ import org.jxmpp.jid.JidTestUtil;
 public class Socks5ClientForInitiatorTest {
 
     // settings
-    static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
-    static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
-    static final DomainBareJid xmppServer = JidTestUtil.DOMAIN_BARE_JID_1;
-    static final DomainBareJid proxyJID = JidTestUtil.MUC_EXAMPLE_ORG;
-    static final String loopbackAddress = InetAddress.getLoopbackAddress().getHostAddress();
+    private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
+    private static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
+    private static final DomainBareJid xmppServer = JidTestUtil.DOMAIN_BARE_JID_1;
+    private static final DomainBareJid proxyJID = JidTestUtil.MUC_EXAMPLE_ORG;
+    private static final String loopbackAddress = InetAddress.getLoopbackAddress().getHostAddress();
 
     private static final int GET_SOCKET_TIMEOUT = 90 * 1000;
 
-    int proxyPort = 7890;
-    String sessionID = "session_id";
+    private static final int proxyPort = 7890;
+    private static final String sessionID = "session_id";
 
     // protocol verifier
-    Protocol protocol;
+    private Protocol protocol;
 
     // mocked XMPP connection
-    XMPPConnection connection;
+    private XMPPConnection connection;
 
     /**
      * Initialize fields used in the tests.
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ProxyTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ProxyTest.java
index a5b0859b8..e780e6c8e 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ProxyTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ProxyTest.java
@@ -44,7 +44,7 @@ import org.junit.Test;
  */
 public class Socks5ProxyTest {
 
-    static final String loopbackAddress = InetAddress.getLoopbackAddress().getHostAddress();
+    private static final String loopbackAddress = InetAddress.getLoopbackAddress().getHostAddress();
 
     /**
      * The SOCKS5 proxy should be a singleton used by all XMPP connections.
@@ -123,7 +123,7 @@ public class Socks5ProxyTest {
     @Test
     public void shouldPreserveAddressOrderOnReplace() {
         Socks5Proxy proxy = Socks5Proxy.getSocks5Proxy();
-        List<String> addresses = new ArrayList<String>(proxy.getLocalAddresses());
+        List<String> addresses = new ArrayList<>(proxy.getLocalAddresses());
         addresses.add("1");
         addresses.add("2");
         addresses.add("3");
@@ -339,7 +339,7 @@ public class Socks5ProxyTest {
         Socks5Proxy socks5Proxy = Socks5Proxy.getSocks5Proxy();
         try {
             String address = InetAddress.getLocalHost().getHostAddress();
-            List<String> addresses = new ArrayList<String>();
+            List<String> addresses = new ArrayList<>();
             addresses.add(address);
             socks5Proxy.replaceLocalAddresses(addresses);
         }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/forward/ForwardedTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/forward/ForwardedTest.java
index d6bd29c00..e24ad2ef4 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/forward/ForwardedTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/forward/ForwardedTest.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.forward;
 
-import static org.jivesoftware.smack.test.util.CharsequenceEquals.equalsCharSequence;
+import static org.jivesoftware.smack.test.util.CharSequenceEquals.equalsCharSequence;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/packet/GeoLocationTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/packet/GeoLocationTest.java
index 0ead8b6fe..53cb6e225 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/packet/GeoLocationTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/packet/GeoLocationTest.java
@@ -105,10 +105,10 @@ public class GeoLocationTest extends InitExtensions {
         + "</message>";
         // @formatter:on
 
-        Message messageWithGeoLocation = (Message) PacketParserUtils.parseStanza(geoLocationMessageString);
+        Message messageWithGeoLocation = PacketParserUtils.parseStanza(geoLocationMessageString);
         assertNotNull(messageWithGeoLocation);
 
-        GeoLocation geoLocation = (GeoLocation) messageWithGeoLocation.getExtension(GeoLocation.ELEMENT,
+        GeoLocation geoLocation = messageWithGeoLocation.getExtension(GeoLocation.ELEMENT,
                         GeoLocation.NAMESPACE);
         assertNotNull(geoLocation);
         assertNotNull(geoLocation.toXML());
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/provider/GeoLocationProviderTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/provider/GeoLocationProviderTest.java
index cdf19fd4f..1dcb2cb57 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/provider/GeoLocationProviderTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/provider/GeoLocationProviderTest.java
@@ -65,10 +65,10 @@ public class GeoLocationProviderTest extends InitExtensions {
         + "</message>";
         // @formatter:on
 
-        Message messageWithGeoLocation = (Message) PacketParserUtils.parseStanza(geoLocationString);
+        Message messageWithGeoLocation = PacketParserUtils.parseStanza(geoLocationString);
         assertNotNull(messageWithGeoLocation);
 
-        GeoLocation geoLocation = (GeoLocation) messageWithGeoLocation.getExtension(GeoLocation.ELEMENT,
+        GeoLocation geoLocation = messageWithGeoLocation.getExtension(GeoLocation.ELEMENT,
                         GeoLocation.NAMESPACE);
         assertNotNull(geoLocation);
 
@@ -132,10 +132,10 @@ public class GeoLocationProviderTest extends InitExtensions {
         + "</message>";
         // @formatter:on
 
-        Message messageWithGeoLocation = (Message) PacketParserUtils.parseStanza(geoLocationString);
+        Message messageWithGeoLocation = PacketParserUtils.parseStanza(geoLocationString);
         assertNotNull(messageWithGeoLocation);
 
-        GeoLocation geoLocation = (GeoLocation) messageWithGeoLocation.getExtension(GeoLocation.ELEMENT,
+        GeoLocation geoLocation = messageWithGeoLocation.getExtension(GeoLocation.ELEMENT,
                         GeoLocation.NAMESPACE);
         assertNotNull(geoLocation);
 
@@ -177,9 +177,9 @@ public class GeoLocationProviderTest extends InitExtensions {
         + "</message>";
         // @formatter:on
 
-        Message messageWithGeoLocation = (Message) PacketParserUtils.parseStanza(geoLocationString);
+        Message messageWithGeoLocation = PacketParserUtils.parseStanza(geoLocationString);
 
-        GeoLocation geoLocation = (GeoLocation) messageWithGeoLocation.getExtension(GeoLocation.ELEMENT,
+        GeoLocation geoLocation = messageWithGeoLocation.getExtension(GeoLocation.ELEMENT,
                         GeoLocation.NAMESPACE);
 
         assertEquals((Double) 90d, geoLocation.getError());
@@ -197,9 +197,9 @@ public class GeoLocationProviderTest extends InitExtensions {
         + "</message>";
         // @formatter:on
 
-        Message messageWithGeoLocation = (Message) PacketParserUtils.parseStanza(geoLocationString);
+        Message messageWithGeoLocation = PacketParserUtils.parseStanza(geoLocationString);
 
-        GeoLocation geoLocation = (GeoLocation) messageWithGeoLocation.getExtension(GeoLocation.ELEMENT,
+        GeoLocation geoLocation = messageWithGeoLocation.getExtension(GeoLocation.ELEMENT,
                         GeoLocation.NAMESPACE);
 
         assertEquals((Double) 90d, geoLocation.getAccuracy());
@@ -218,9 +218,9 @@ public class GeoLocationProviderTest extends InitExtensions {
         + "</message>";
         // @formatter:on
 
-        Message messageWithGeoLocation = (Message) PacketParserUtils.parseStanza(geoLocationString);
+        Message messageWithGeoLocation = PacketParserUtils.parseStanza(geoLocationString);
 
-        GeoLocation geoLocation = (GeoLocation) messageWithGeoLocation.getExtension(GeoLocation.ELEMENT,
+        GeoLocation geoLocation = messageWithGeoLocation.getExtension(GeoLocation.ELEMENT,
                         GeoLocation.NAMESPACE);
 
         assertEquals((Double) 90d, geoLocation.getAccuracy());
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/iqlast/LastActivityTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/iqlast/LastActivityTest.java
index 329a343b3..9500ceab1 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/iqlast/LastActivityTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/iqlast/LastActivityTest.java
@@ -44,7 +44,7 @@ public class LastActivityTest extends InitExtensions {
 
         DummyConnection c = new DummyConnection();
         c.connect();
-        IQ lastRequest = (IQ) PacketParserUtils.parseStanza(xml.asString());
+        IQ lastRequest = PacketParserUtils.parseStanza(xml.asString());
         assertTrue(lastRequest instanceof LastActivity);
 
         c.processStanza(lastRequest);
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/iqversion/VersionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/iqversion/VersionTest.java
index ecc730059..574bed4e9 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/iqversion/VersionTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/iqversion/VersionTest.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.iqversion;
 
-import static org.jivesoftware.smack.test.util.CharsequenceEquals.equalsCharSequence;
+import static org.jivesoftware.smack.test.util.CharSequenceEquals.equalsCharSequence;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
@@ -45,7 +45,7 @@ public class VersionTest extends InitExtensions {
         // Enable version replys for this connection
         VersionManager.setAutoAppendSmackVersion(false);
         VersionManager.getInstanceFor(con).setVersion("Test", "0.23", "DummyOS");
-        IQ versionRequest = (IQ) PacketParserUtils.parseStanza(control);
+        IQ versionRequest = PacketParserUtils.parseStanza(control);
 
         assertTrue(versionRequest instanceof Version);
 
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesExtensionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesExtensionTest.java
index 2e47bc708..1c50e6369 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesExtensionTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesExtensionTest.java
@@ -55,7 +55,7 @@ public class JivePropertiesExtensionTest extends InitExtensions {
                         + "</message>";
         // @formatter:on
 
-        Message message = (Message) PacketParserUtils.parseStanza(properties);
+        Message message = PacketParserUtils.parseStanza(properties);
         JivePropertiesExtension jpe = JivePropertiesExtension.from(message);
         assertNotNull(jpe);
 
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/message_correct/MessageCorrectExtensionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/message_correct/MessageCorrectExtensionTest.java
index aec7adb5a..ef9d72954 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/message_correct/MessageCorrectExtensionTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/message_correct/MessageCorrectExtensionTest.java
@@ -26,20 +26,20 @@ import org.junit.Test;
 
 public class MessageCorrectExtensionTest {
 
-    private final String idInitialMessage = "bad1";
+    private static final String idInitialMessage = "bad1";
 
-    private final String initialMessageXml = "<message to='juliet@capulet.net/balcony' id='good1'>"
+    private static final String initialMessageXml = "<message to='juliet@capulet.net/balcony' id='good1'>"
             + "<body>But soft, what light through yonder window breaks?</body>" + "</message>";
 
-    private final CharSequence messageCorrectionXml = "<replace xmlns='urn:xmpp:message-correct:0' id='bad1'/>";
+    private static final CharSequence messageCorrectionXml = "<replace xmlns='urn:xmpp:message-correct:0' id='bad1'/>";
 
-    private final CharSequence expectedXml = "<message to='juliet@capulet.net/balcony' id='good1'>"
+    private static final CharSequence expectedXml = "<message to='juliet@capulet.net/balcony' id='good1'>"
             + "<body>But soft, what light through yonder window breaks?</body>"
             + "<replace xmlns='urn:xmpp:message-correct:0' id='bad1'/>" + "</message>";
 
     @Test
     public void checkStanzas() throws Exception {
-        Message initialMessage = (Message) PacketParserUtils.parseStanza(initialMessageXml);
+        Message initialMessage = PacketParserUtils.parseStanza(initialMessageXml);
         MessageCorrectExtension messageCorrectExtension = new MessageCorrectExtension(idInitialMessage);
 
         Assert.assertEquals(messageCorrectExtension.toXML().toString(), messageCorrectionXml);
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/muc/packet/MUCUserTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/muc/packet/MUCUserTest.java
index 426ced5c9..3dec3bca9 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/muc/packet/MUCUserTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/muc/packet/MUCUserTest.java
@@ -28,10 +28,10 @@ import org.junit.Test;
 
 public class MUCUserTest {
 
-    private static final Set<Status> createStatusSet() {
+    private static Set<Status> createStatusSet() {
         Status status301 = Status.create(301);
         Status status110 = Status.create(110);
-        Set<Status> statusSet = new HashSet<Status>();
+        Set<Status> statusSet = new HashSet<>();
         statusSet.add(status301);
         statusSet.add(status110);
 
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java
index f954f9dbf..33f836ba2 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.ping;
 
-import static org.jivesoftware.smack.test.util.CharsequenceEquals.equalsCharSequence;
+import static org.jivesoftware.smack.test.util.CharSequenceEquals.equalsCharSequence;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
@@ -54,7 +54,7 @@ public class PingTest extends InitExtensions {
         con.connect();
         // Enable ping for this connection
         PingManager.getInstanceFor(con);
-        IQ pingRequest = (IQ) PacketParserUtils.parseStanza(control);
+        IQ pingRequest = PacketParserUtils.parseStanza(control);
 
         assertTrue(pingRequest instanceof Ping);
 
@@ -71,7 +71,7 @@ public class PingTest extends InitExtensions {
 
     @Test
     public void checkSendingPing() throws InterruptedException, SmackException, IOException, XMPPException {
-        DummyConnection dummyCon = getAuthentiactedDummyConnection();
+        DummyConnection dummyCon = getAuthenticatedDummyConnection();
         PingManager pinger = PingManager.getInstanceFor(dummyCon);
         try {
             pinger.ping(DUMMY_AT_EXAMPLE_ORG);
@@ -86,7 +86,7 @@ public class PingTest extends InitExtensions {
 
     @Test
     public void checkSuccessfulPing() throws Exception {
-        ThreadedDummyConnection threadedCon = getAuthentiactedDummyConnection();
+        ThreadedDummyConnection threadedCon = getAuthenticatedDummyConnection();
 
         PingManager pinger = PingManager.getInstanceFor(threadedCon);
 
@@ -123,7 +123,7 @@ public class PingTest extends InitExtensions {
      */
     @Test
     public void checkFailedPingToEntityError() throws Exception {
-        ThreadedDummyConnection threadedCon = getAuthentiactedDummyConnection();
+        ThreadedDummyConnection threadedCon = getAuthenticatedDummyConnection();
         // @formatter:off
         String reply = 
                 "<iq type='error' id='qrzSp-16' to='test@myserver.com'>" +
@@ -133,7 +133,7 @@ public class PingTest extends InitExtensions {
                         "</error>" + 
                  "</iq>";
         // @formatter:on
-        IQ serviceUnavailable = (IQ) PacketParserUtils.parseStanza(reply);
+        IQ serviceUnavailable = PacketParserUtils.parseStanza(reply);
         threadedCon.addIQReply(serviceUnavailable);
 
         PingManager pinger = PingManager.getInstanceFor(threadedCon);
@@ -145,7 +145,7 @@ public class PingTest extends InitExtensions {
 
     @Test
     public void checkPingToServerSuccess() throws Exception {
-        ThreadedDummyConnection con = getAuthentiactedDummyConnection();
+        ThreadedDummyConnection con = getAuthenticatedDummyConnection();
         PingManager pinger = PingManager.getInstanceFor(con);
 
         boolean pingSuccess = pinger.pingMyServer();
@@ -159,7 +159,7 @@ public class PingTest extends InitExtensions {
      */
     @Test
     public void checkPingToServerError() throws Exception {
-        ThreadedDummyConnection con = getAuthentiactedDummyConnection();
+        ThreadedDummyConnection con = getAuthenticatedDummyConnection();
         // @formatter:off
         String reply = 
                 "<iq type='error' id='qrzSp-16' to='test@myserver.com' from='" + con.getXMPPServiceDomain() + "'>" +
@@ -169,7 +169,7 @@ public class PingTest extends InitExtensions {
                         "</error>" + 
                  "</iq>";
         // @formatter:on
-        IQ serviceUnavailable = (IQ) PacketParserUtils.parseStanza(reply);
+        IQ serviceUnavailable = PacketParserUtils.parseStanza(reply);
         con.addIQReply(serviceUnavailable);
 
         PingManager pinger = PingManager.getInstanceFor(con);
@@ -190,7 +190,7 @@ public class PingTest extends InitExtensions {
 
     @Test
     public void checkSuccessfulDiscoRequest() throws Exception {
-        ThreadedDummyConnection con = getAuthentiactedDummyConnection();
+        ThreadedDummyConnection con = getAuthenticatedDummyConnection();
         DiscoverInfo info = new DiscoverInfo();
         info.addFeature(Ping.NAMESPACE);
 
@@ -201,7 +201,7 @@ public class PingTest extends InitExtensions {
                             "<feature var='urn:xmpp:ping'/>" +
                         "</query></iq>";
         // @formatter:on
-        IQ discoReply = (IQ) PacketParserUtils.parseStanza(reply);
+        IQ discoReply = PacketParserUtils.parseStanza(reply);
         con.addIQReply(discoReply);
 
         PingManager pinger = PingManager.getInstanceFor(con);
@@ -211,8 +211,8 @@ public class PingTest extends InitExtensions {
     }
 
     @Test
-    public void checkUnuccessfulDiscoRequest() throws Exception {
-        ThreadedDummyConnection con = getAuthentiactedDummyConnection();
+    public void checkUnsuccessfulDiscoRequest() throws Exception {
+        ThreadedDummyConnection con = getAuthenticatedDummyConnection();
         DiscoverInfo info = new DiscoverInfo();
         info.addFeature(Ping.NAMESPACE);
 
@@ -223,7 +223,7 @@ public class PingTest extends InitExtensions {
                             "<feature var='urn:xmpp:noping'/>" +
                         "</query></iq>";
         // @formatter:on
-        IQ discoReply = (IQ) PacketParserUtils.parseStanza(reply);
+        IQ discoReply = PacketParserUtils.parseStanza(reply);
         con.addIQReply(discoReply);
 
         PingManager pinger = PingManager.getInstanceFor(con);
@@ -232,7 +232,7 @@ public class PingTest extends InitExtensions {
         assertFalse(pingSupported);
     }
 
-    private static ThreadedDummyConnection getAuthentiactedDummyConnection() throws SmackException, IOException, XMPPException, InterruptedException {
+    private static ThreadedDummyConnection getAuthenticatedDummyConnection() throws SmackException, IOException, XMPPException, InterruptedException {
         ThreadedDummyConnection connection = new ThreadedDummyConnection();
         connection.connect();
         connection.login();
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/privacy/provider/PrivacyProviderTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/privacy/provider/PrivacyProviderTest.java
index 2dddac6b4..9903d38d2 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/privacy/provider/PrivacyProviderTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/privacy/provider/PrivacyProviderTest.java
@@ -49,7 +49,7 @@ public class PrivacyProviderTest extends InitExtensions {
           + "</query>"
           + "</iq>";
         // @formatter:on
-        IQ iqPrivacyList = (IQ) PacketParserUtils.parseStanza(xmlPrivacyList);
+        IQ iqPrivacyList = PacketParserUtils.parseStanza(xmlPrivacyList);
         assertTrue(iqPrivacyList instanceof Privacy);
 
         Privacy privacyList = (Privacy) iqPrivacyList;
@@ -85,7 +85,7 @@ public class PrivacyProviderTest extends InitExtensions {
           + "</query>"
           + "</iq>";
         // @formatter:on
-        IQ iqPrivacyList = (IQ) PacketParserUtils.parseStanza(xmlPrivacyList);
+        IQ iqPrivacyList = PacketParserUtils.parseStanza(xmlPrivacyList);
         assertTrue(iqPrivacyList instanceof Privacy);
 
         Privacy privacyList = (Privacy) iqPrivacyList;
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java
index 7b9d261cf..461ce7e8a 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java
@@ -54,7 +54,7 @@ public class ConfigureFormTest extends InitExtensions
     }
 
     @Test
-    public void getConfigFormWithInsufficientPriviliges() throws XMPPException, SmackException, IOException, InterruptedException
+    public void getConfigFormWithInsufficientPrivileges() throws XMPPException, SmackException, IOException, InterruptedException
     {
         ThreadedDummyConnection con = ThreadedDummyConnection.newInstance();
         PubSubManager mgr = new PubSubManager(con, PubSubManagerTest.DUMMY_PUBSUB_SERVICE);
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java
index 8e2796b50..98e75bd28 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java
@@ -80,15 +80,15 @@ public class ItemValidationTest extends InitExtensions {
     {
         SimplePayload payload = new SimplePayload(null, null, "<data>This is the payload</data>");
 
-        PayloadItem<SimplePayload> simpleItem = new PayloadItem<SimplePayload>(payload);
+        PayloadItem<SimplePayload> simpleItem = new PayloadItem<>(payload);
         String simpleCtrl = "<item>" + payload.toXML() + "</item>";
         assertXMLEqual(simpleCtrl, simpleItem.toXML());
 
-        PayloadItem<SimplePayload> idItem = new PayloadItem<SimplePayload>("uniqueid", payload);
+        PayloadItem<SimplePayload> idItem = new PayloadItem<>("uniqueid", payload);
         String idCtrl = "<item id='uniqueid'>" + payload.toXML() + "</item>";
         assertXMLEqual(idCtrl, idItem.toXML());
 
-        PayloadItem<SimplePayload> itemWithNodeId = new PayloadItem<SimplePayload>("testId", "testNode", payload);
+        PayloadItem<SimplePayload> itemWithNodeId = new PayloadItem<>("testId", "testNode", payload);
         String nodeIdCtrl = "<item id='testId' node='testNode'>" + payload.toXML() + "</item>";
         assertXMLEqual(nodeIdCtrl, itemWithNodeId.toXML());
     }
@@ -233,6 +233,6 @@ public class ItemValidationTest extends InitExtensions {
         assertEquals("testid1", item.getId());
         assertTrue(item.getPayload() instanceof SimplePayload);
 
-        assertXMLEqual(itemContent, ((SimplePayload) item.getPayload()).toXML().toString());
+        assertXMLEqual(itemContent, item.getPayload().toXML().toString());
     }
 }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
index 970d23f32..b1b06a982 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.receipts;
 
-import static org.jivesoftware.smack.test.util.CharsequenceEquals.equalsCharSequence;
+import static org.jivesoftware.smack.test.util.CharSequenceEquals.equalsCharSequence;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -61,8 +61,7 @@ public class DeliveryReceiptTest extends InitExtensions {
         parser = PacketParserUtils.getParserFor(control);
         Message p = PacketParserUtils.parseMessage(parser);
 
-        DeliveryReceiptRequest drr = (DeliveryReceiptRequest) p.getExtension(
-                        DeliveryReceiptRequest.ELEMENT, DeliveryReceipt.NAMESPACE);
+        DeliveryReceiptRequest drr = p.getExtension(DeliveryReceiptRequest.ELEMENT, DeliveryReceipt.NAMESPACE);
         assertNotNull(drr);
 
         assertTrue(DeliveryReceiptManager.hasDeliveryReceiptRequest(p));
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/rsm/provider/RSMSetProviderTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/rsm/provider/RSMSetProviderTest.java
index a71f69f58..7a99a6af9 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/rsm/provider/RSMSetProviderTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/rsm/provider/RSMSetProviderTest.java
@@ -48,8 +48,8 @@ public class RSMSetProviderTest extends InitExtensions {
           + "</iq>";
         // @formatter:on
 
-        IQ iqWithRsm = (IQ) PacketParserUtils.parseStanza(rsmset);
-        RSMSet rsm = (RSMSet) iqWithRsm.getExtension(RSMSet.ELEMENT, RSMSet.NAMESPACE);
+        IQ iqWithRsm = PacketParserUtils.parseStanza(rsmset);
+        RSMSet rsm = iqWithRsm.getExtension(RSMSet.ELEMENT, RSMSet.NAMESPACE);
         assertNotNull(rsm);
         assertEquals("aftervalue", rsm.getAfter());
         assertEquals("beforevalue", rsm.getBefore());
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/time/provider/TimeProviderTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/time/provider/TimeProviderTest.java
index 14f7bcbcd..5d852f0f1 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/time/provider/TimeProviderTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/time/provider/TimeProviderTest.java
@@ -39,7 +39,7 @@ public class TimeProviderTest {
           + "<time xmlns='urn:xmpp:time'/>"
           + "</iq>";
         // @formatter:on
-        IQ iqRequest = (IQ) PacketParserUtils.parseStanza(request);
+        IQ iqRequest = PacketParserUtils.parseStanza(request);
         assertTrue(iqRequest instanceof Time);
 
         // @formatter:off
@@ -54,7 +54,7 @@ public class TimeProviderTest {
           + "</time>"
           + "</iq>";
         // @formatter:on
-        IQ iqResponse = (IQ) PacketParserUtils.parseStanza(response);
+        IQ iqResponse = PacketParserUtils.parseStanza(response);
         assertTrue(iqResponse instanceof Time);
         Time time = (Time) iqResponse;
         assertEquals("-06:00", time.getTzo());
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/vcardtemp/VCardTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/vcardtemp/VCardTest.java
index 40366d850..65050f546 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/vcardtemp/VCardTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/vcardtemp/VCardTest.java
@@ -90,7 +90,7 @@ public class VCardTest extends InitExtensions {
             + "</iq>";
         // @formatter:on
 
-        VCard vCard = (VCard) PacketParserUtils.parseStanza(request);
+        VCard vCard = PacketParserUtils.parseStanza(request);
 
         assertEquals("User", vCard.getFirstName());
         assertEquals("Name", vCard.getLastName());
@@ -139,7 +139,7 @@ public class VCardTest extends InitExtensions {
                         + "</iq>";
         // @formatter:on
 
-        VCard vCard = (VCard) PacketParserUtils.parseStanza(request);
+        VCard vCard = PacketParserUtils.parseStanza(request);
 
         assertEquals("foo@fee.www.bar", vCard.getEmailHome());
     }
@@ -154,7 +154,7 @@ public class VCardTest extends InitExtensions {
                         + "</iq>";
         // @formatter:on
 
-        VCard vCard = (VCard) PacketParserUtils.parseStanza(request);
+        VCard vCard = PacketParserUtils.parseStanza(request);
 
         assertEquals("3443233", vCard.getPhoneWork("FAX"));
     }
@@ -169,7 +169,7 @@ public class VCardTest extends InitExtensions {
                         + "</iq>";
         // @formatter:on
 
-        VCard vCard = (VCard) PacketParserUtils.parseStanza(request);
+        VCard vCard = PacketParserUtils.parseStanza(request);
 
         assertEquals("1234", vCard.getField("UNKNOWN"));
     }
@@ -184,7 +184,7 @@ public class VCardTest extends InitExtensions {
                         + "</iq>";
         // @formatter:on
 
-        VCard vCard = (VCard) PacketParserUtils.parseStanza(request);
+        VCard vCard = PacketParserUtils.parseStanza(request);
 
         assertEquals(null, vCard.getField("UNKNOWN"));
     }
@@ -199,7 +199,7 @@ public class VCardTest extends InitExtensions {
                         + "</iq>";
         // @formatter:on
 
-        VCard vCard = (VCard) PacketParserUtils.parseStanza(request);
+        VCard vCard = PacketParserUtils.parseStanza(request);
         assertEquals(null, vCard.getField("UNKNOWN"));
     }
 
@@ -213,7 +213,7 @@ public class VCardTest extends InitExtensions {
                         + "</iq>";
         // @formatter:on
 
-        VCard vCard = (VCard) PacketParserUtils.parseStanza(request);
+        VCard vCard = PacketParserUtils.parseStanza(request);
         assertEquals(null, vCard.getField("UNKNOWN"));
     }
 
@@ -227,7 +227,7 @@ public class VCardTest extends InitExtensions {
                         + "</iq>";
         // @formatter:on
 
-        VCard vCard = (VCard) PacketParserUtils.parseStanza(request);
+        VCard vCard = PacketParserUtils.parseStanza(request);
 
         assertEquals("Some street", vCard.getAddressFieldWork("STREET"));
         assertEquals("ddss", vCard.getAddressFieldWork("FF"));
@@ -244,7 +244,7 @@ public class VCardTest extends InitExtensions {
                         + "</iq>";
         // @formatter:on
 
-        VCard vCard = (VCard) PacketParserUtils.parseStanza(request);
+        VCard vCard = PacketParserUtils.parseStanza(request);
 
         assertEquals("kir max", vCard.getField("FN"));
     }
@@ -263,7 +263,7 @@ public class VCardTest extends InitExtensions {
                         + "</iq>";
         // @formatter:on
 
-        VCard vCard = (VCard) PacketParserUtils.parseStanza(request);
+        VCard vCard = PacketParserUtils.parseStanza(request);
 
         byte[] avatar = vCard.getAvatar();
         String mimeType = vCard.getAvatarMimeType();
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdata/packet/DataFormTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/xdata/packet/DataFormTest.java
index 5e7514146..5500125e9 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdata/packet/DataFormTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/xdata/packet/DataFormTest.java
@@ -46,7 +46,7 @@ public class DataFormTest {
     private static final String TEST_OUTPUT_2 = "<x xmlns='jabber:x:data' type='submit'><instructions>InstructionTest1</instructions><field var='testField1'></field><page xmlns='http://jabber.org/protocol/xdata-layout' label='Label'><fieldref var='testField1'/><section label='section Label'><text>SectionText</text></section><text>PageText</text></page></x>";
     private static final String TEST_OUTPUT_3 = "<x xmlns='jabber:x:data' type='submit'><instructions>InstructionTest1</instructions><field var='testField1'><validate xmlns='http://jabber.org/protocol/xdata-validate' datatype='xs:integer'><range min='1111' max='9999'/></validate></field></x>";
 
-    DataFormProvider pr = new DataFormProvider();
+    private static final DataFormProvider pr = new DataFormProvider();
 
     @Test
     public void test() throws Exception {
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProviderTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProviderTest.java
index f59ea4e5a..b4e53586a 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProviderTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProviderTest.java
@@ -17,7 +17,7 @@
 package org.jivesoftware.smackx.xhtmlim.provider;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.jivesoftware.smack.test.util.CharsequenceEquals.equalsCharSequence;
+import static org.jivesoftware.smack.test.util.CharSequenceEquals.equalsCharSequence;
 import static org.junit.Assert.assertThat;
 
 import java.io.IOException;
diff --git a/smack-extensions/src/test/java/org/jivesoftware/util/Protocol.java b/smack-extensions/src/test/java/org/jivesoftware/util/Protocol.java
index 09e9c14c7..ead9f27f1 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/util/Protocol.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/util/Protocol.java
@@ -94,16 +94,16 @@ public class Protocol {
     public boolean printProtocol = false;
 
     // responses to requests are taken form this queue
-    Queue<Stanza> responses = new LinkedList<Stanza>();
+    private final Queue<Stanza> responses = new LinkedList<>();
 
     // list of verifications
-    List<Verification<?, ?>[]> verificationList = new ArrayList<Verification<?, ?>[]>();
+    private final List<Verification<?, ?>[]> verificationList = new ArrayList<>();
 
     // list of requests
-    List<Stanza> requests = new ArrayList<Stanza>();
+    private final List<Stanza> requests = new ArrayList<>();
 
     // list of all responses
-    List<Stanza> responsesList = new ArrayList<Stanza>();
+    private final List<Stanza> responsesList = new ArrayList<>();
 
     /**
      * Adds a responses and all verifications for the request/response pair to
diff --git a/smack-extensions/src/test/java/org/jivesoftware/util/Verification.java b/smack-extensions/src/test/java/org/jivesoftware/util/Verification.java
index 42593a8b2..bbf643fda 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/util/Verification.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/util/Verification.java
@@ -37,7 +37,7 @@ public interface Verification<T extends Stanza, S extends Stanza> {
      * Verifies that the "To" field of the request corresponds with the "From" field of
      * the response.
      */
-    public static Verification<Stanza, Stanza> correspondingSenderReceiver = new Verification<Stanza, Stanza>() {
+    Verification<Stanza, Stanza> correspondingSenderReceiver = new Verification<Stanza, Stanza>() {
 
         @Override
         public void verify(Stanza request, Stanza response) {
@@ -49,7 +49,7 @@ public interface Verification<T extends Stanza, S extends Stanza> {
     /**
      * Verifies that the type of the request is a GET.
      */
-    public static Verification<IQ, Stanza> requestTypeGET = new Verification<IQ, Stanza>() {
+    Verification<IQ, Stanza> requestTypeGET = new Verification<IQ, Stanza>() {
 
         @Override
         public void verify(IQ request, Stanza response) {
@@ -61,7 +61,7 @@ public interface Verification<T extends Stanza, S extends Stanza> {
     /**
      * Verifies that the type of the request is a SET.
      */
-    public static Verification<IQ, Stanza> requestTypeSET = new Verification<IQ, Stanza>() {
+    Verification<IQ, Stanza> requestTypeSET = new Verification<IQ, Stanza>() {
 
         @Override
         public void verify(IQ request, Stanza response) {
@@ -73,7 +73,7 @@ public interface Verification<T extends Stanza, S extends Stanza> {
     /**
      * Verifies that the type of the request is a RESULT.
      */
-    public static Verification<IQ, Stanza> requestTypeRESULT = new Verification<IQ, Stanza>() {
+    Verification<IQ, Stanza> requestTypeRESULT = new Verification<IQ, Stanza>() {
 
         @Override
         public void verify(IQ request, Stanza response) {
@@ -85,7 +85,7 @@ public interface Verification<T extends Stanza, S extends Stanza> {
     /**
      * Verifies that the type of the request is an ERROR.
      */
-    public static Verification<IQ, Stanza> requestTypeERROR = new Verification<IQ, Stanza>() {
+    Verification<IQ, Stanza> requestTypeERROR = new Verification<IQ, Stanza>() {
 
         @Override
         public void verify(IQ request, Stanza response) {
@@ -100,6 +100,6 @@ public interface Verification<T extends Stanza, S extends Stanza> {
      * @param request the request collected by the mocked XMPP connection
      * @param response the response added to the protocol instance
      */
-    public void verify(T request, S response);
+    void verify(T request, S response);
 
 }
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/chat/Chat.java b/smack-im/src/main/java/org/jivesoftware/smack/chat/Chat.java
index e409be049..0aa9e06e2 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/chat/Chat.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/chat/Chat.java
@@ -42,10 +42,10 @@ import org.jxmpp.jid.EntityJid;
 @Deprecated
 public class Chat {
 
-    private ChatManager chatManager;
-    private String threadID;
-    private EntityJid participant;
-    private final Set<ChatMessageListener> listeners = new CopyOnWriteArraySet<ChatMessageListener>();
+    private final ChatManager chatManager;
+    private final String threadID;
+    private final EntityJid participant;
+    private final Set<ChatMessageListener> listeners = new CopyOnWriteArraySet<>();
 
     /**
      * Creates a new chat with the specified user and thread ID.
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java b/smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java
index 1a10259fe..d258c0f82 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java
@@ -60,7 +60,7 @@ public final class ChatManager extends Manager{
 
     private static final Logger LOGGER = Logger.getLogger(ChatManager.class.getName());
 
-    private static final Map<XMPPConnection, ChatManager> INSTANCES = new WeakHashMap<XMPPConnection, ChatManager>();
+    private static final Map<XMPPConnection, ChatManager> INSTANCES = new WeakHashMap<>();
 
     /**
      * Sets the default behaviour for allowing 'normal' messages to be used in chats. As some clients don't set
@@ -128,23 +128,21 @@ public final class ChatManager extends Manager{
     /**
      * Maps thread ID to chat.
      */
-    private Map<String, Chat> threadChats = new ConcurrentHashMap<>();
+    private final Map<String, Chat> threadChats = new ConcurrentHashMap<>();
 
     /**
      * Maps jids to chats
      */
-    private Map<Jid, Chat> jidChats = new ConcurrentHashMap<>();
+    private final Map<Jid, Chat> jidChats = new ConcurrentHashMap<>();
 
     /**
      * Maps base jids to chats
      */
-    private Map<EntityBareJid, Chat> baseJidChats = new ConcurrentHashMap<>();
+    private final Map<EntityBareJid, Chat> baseJidChats = new ConcurrentHashMap<>();
 
-    private Set<ChatManagerListener> chatManagerListeners
-            = new CopyOnWriteArraySet<ChatManagerListener>();
+    private final Set<ChatManagerListener> chatManagerListeners = new CopyOnWriteArraySet<>();
 
-    private Map<MessageListener, StanzaFilter> interceptors
-            = new WeakHashMap<MessageListener, StanzaFilter>();
+    private final Map<MessageListener, StanzaFilter> interceptors = new WeakHashMap<>();
 
     private ChatManager(XMPPConnection connection) {
         super(connection);
@@ -339,7 +337,7 @@ public final class ChatManager extends Manager{
     }
 
     /**
-     * Register a new listener with the ChatManager to recieve events related to chats.
+     * Register a new listener with the ChatManager to receive events related to chats.
      *
      * @param listener the listener.
      */
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/PresenceEventListener.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/PresenceEventListener.java
index d7b13e755..be227d95a 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/roster/PresenceEventListener.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/PresenceEventListener.java
@@ -24,13 +24,13 @@ import org.jxmpp.jid.Jid;
 
 public interface PresenceEventListener {
 
-    public void presenceAvailable(FullJid address, Presence availablePresence);
+    void presenceAvailable(FullJid address, Presence availablePresence);
 
-    public void presenceUnavailable(FullJid address, Presence presence);
+    void presenceUnavailable(FullJid address, Presence presence);
 
-    public void presenceError(Jid address, Presence errorPresence);
+    void presenceError(Jid address, Presence errorPresence);
 
-    public void presenceSubscribed(BareJid address, Presence subscribedPresence);
+    void presenceSubscribed(BareJid address, Presence subscribedPresence);
 
-    public void presenceUnsubscribed(BareJid address, Presence unsubscribedPresence);
+    void presenceUnsubscribed(BareJid address, Presence unsubscribedPresence);
 }
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java
index a040ce291..69d017d75 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java
@@ -147,7 +147,7 @@ public final class Roster extends Manager {
     private static int defaultNonRosterPresenceMapMaxSize = INITIAL_DEFAULT_NON_ROSTER_PRESENCE_MAP_SIZE;
 
     private RosterStore rosterStore;
-    private final Map<String, RosterGroup> groups = new ConcurrentHashMap<String, RosterGroup>();
+    private final Map<String, RosterGroup> groups = new ConcurrentHashMap<>();
 
     /**
      * Concurrent hash map from JID to its roster entry.
@@ -754,7 +754,7 @@ public final class Roster extends Manager {
         final XMPPConnection connection = getAuthenticatedConnectionOrThrow();
 
         // Only remove the entry if it's in the entry list.
-        // The actual removal logic takes place in RosterPacketListenerprocess>>Packet(Packet)
+        // The actual removal logic takes place in RosterPacketListenerProcess>>Packet(Packet)
         if (!entries.containsKey(entry.getJid())) {
             return;
         }
@@ -781,7 +781,7 @@ public final class Roster extends Manager {
      * <p>
      * The method guarantees that the listener is only invoked after
      * {@link RosterEntries#rosterEntries(Collection)} has been invoked, and that all roster events
-     * that happen while <code>rosterEntires(Collection) </code> is called are queued until the
+     * that happen while <code>rosterEntries(Collection) </code> is called are queued until the
      * method returns.
      * </p>
      * <p>
@@ -1078,7 +1078,7 @@ public final class Roster extends Manager {
             res = Arrays.asList(presence);
         }
         else {
-            List<Presence> answer = new ArrayList<Presence>();
+            List<Presence> answer = new ArrayList<>();
             // Used in case no available presence is found
             Presence unavailable = null;
             for (Presence presence : userPresences.values()) {
@@ -1213,7 +1213,7 @@ public final class Roster extends Manager {
                     }
                     catch (NotConnectedException e) {
                         throw new IllegalStateException(
-                                        "presencePakcetListener should never throw a NotConnectedException when processStanza is called with a presence of type unavailable",
+                                        "presencePacketListener should never throw a NotConnectedException when processStanza is called with a presence of type unavailable",
                                         e);
                     }
                     catch (InterruptedException e) {
@@ -1305,7 +1305,7 @@ public final class Roster extends Manager {
         }
 
         // Add the entry/user to the groups
-        List<String> newGroupNames = new ArrayList<String>();
+        List<String> newGroupNames = new ArrayList<>();
         for (String groupName : item.getGroupNames()) {
             // Add the group name to the list.
             newGroupNames.add(groupName);
@@ -1321,7 +1321,7 @@ public final class Roster extends Manager {
         }
 
         // Remove user from the remaining groups.
-        List<String> oldGroupNames = new ArrayList<String>();
+        List<String> oldGroupNames = new ArrayList<>();
         for (RosterGroup group : getGroups()) {
             oldGroupNames.add(group.getName());
         }
@@ -1595,7 +1595,7 @@ public final class Roster extends Manager {
                 RosterPacket rosterPacket = (RosterPacket) packet;
 
                 // Ignore items without valid subscription type
-                ArrayList<Item> validItems = new ArrayList<RosterPacket.Item>();
+                ArrayList<Item> validItems = new ArrayList<>();
                 for (RosterPacket.Item item : rosterPacket.getRosterItems()) {
                     if (hasValidSubscriptionType(item)) {
                         validItems.add(item);
@@ -1659,10 +1659,10 @@ public final class Roster extends Manager {
             fireRosterChangedEvent(addedEntries, updatedEntries, deletedEntries);
 
             // Call the roster loaded listeners after the roster events have been fired. This is
-            // imporant because the user may call getEntriesAndAddListener() in onRosterLoaded(),
+            // important because the user may call getEntriesAndAddListener() in onRosterLoaded(),
             // and if the order would be the other way around, the roster listener added by
             // getEntriesAndAddListener() would be invoked with information that was already
-            // available at the time getEntriesAndAddListenr() was called.
+            // available at the time getEntriesAndAddListener() was called.
             try {
                 synchronized (rosterLoadedListeners) {
                     for (RosterLoadedListener rosterLoadedListener : rosterLoadedListeners) {
@@ -1721,7 +1721,7 @@ public final class Roster extends Manager {
             // A roster push must contain exactly one entry
             Collection<Item> items = rosterPacket.getRosterItems();
             if (items.size() != 1) {
-                LOGGER.warning("Ignoring roster push with not exaclty one entry. size=" + items.size());
+                LOGGER.warning("Ignoring roster push with not exactly one entry. size=" + items.size());
                 return IQ.createErrorResponse(iqRequest, Condition.bad_request);
             }
 
@@ -1730,7 +1730,7 @@ public final class Roster extends Manager {
             Collection<Jid> deletedEntries = new ArrayList<>();
             Collection<Jid> unchangedEntries = new ArrayList<>();
 
-            // We assured above that the size of items is exaclty 1, therefore we are able to
+            // We assured above that the size of items is exactly 1, therefore we are able to
             // safely retrieve this single item here.
             Item item = items.iterator().next();
             RosterEntry entry = new RosterEntry(item, Roster.this, connection);
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntries.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntries.java
index 267277009..831db15c2 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntries.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntries.java
@@ -20,6 +20,6 @@ import java.util.Collection;
 
 public interface RosterEntries {
 
-    public void rosterEntries(Collection<RosterEntry> rosterEntries);
+    void rosterEntries(Collection<RosterEntry> rosterEntries);
 
 }
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntry.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntry.java
index 2b1e7aaa6..d6d7a04f0 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntry.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntry.java
@@ -117,11 +117,9 @@ public final class RosterEntry extends Manager {
     }
 
     /**
-     * Updates the state of the entry with the new values.
+     * Updates this entries item.
      *
-     * @param name the nickname for the entry.
-     * @param type the subscription type.
-     * @param subscriptionPending TODO
+     * @param item new item
      */
     void updateItem(RosterPacket.Item item) {
         assert (item != null);
@@ -143,7 +141,7 @@ public final class RosterEntry extends Manager {
      * @return an iterator for the groups this entry belongs to.
      */
     public List<RosterGroup> getGroups() {
-        List<RosterGroup> results = new ArrayList<RosterGroup>();
+        List<RosterGroup> results = new ArrayList<>();
         // Loop through all roster groups and find the ones that contain this
         // entry. This algorithm should be fine
         for (RosterGroup group : roster.getGroups()) {
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterGroup.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterGroup.java
index 76d990c20..9af55baf9 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterGroup.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterGroup.java
@@ -52,7 +52,7 @@ public class RosterGroup extends Manager {
     RosterGroup(String name, XMPPConnection connection) {
         super(connection);
         this.name = name;
-        entries = new LinkedHashSet<RosterEntry>();
+        entries = new LinkedHashSet<>();
     }
 
     /**
@@ -108,7 +108,7 @@ public class RosterGroup extends Manager {
      */
     public List<RosterEntry> getEntries() {
         synchronized (entries) {
-            return new ArrayList<RosterEntry>(entries);
+            return new ArrayList<>(entries);
         }
     }
 
@@ -200,7 +200,7 @@ public class RosterGroup extends Manager {
      */
     public void removeEntry(RosterEntry entry) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
         // Only remove the entry if it's in the entry list.
-        // Remove the entry locally, if we wait for RosterPacketListenerprocess>>Packet(Packet)
+        // Remove the entry locally, if we wait for RosterPacketListenerProcess>>Packet(Packet)
         // to take place the entry will exist in the group until a packet is received from the 
         // server.
         synchronized (entries) {
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterListener.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterListener.java
index 81589d907..80dcb986a 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterListener.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterListener.java
@@ -37,21 +37,21 @@ public interface RosterListener {
      *
      * @param addresses the XMPP addresses of the contacts that have been added to the roster.
      */
-    public void entriesAdded(Collection<Jid> addresses);
+    void entriesAdded(Collection<Jid> addresses);
 
     /**
      * Called when a roster entries are updated.
      *
      * @param addresses the XMPP addresses of the contacts whose entries have been updated.
      */
-    public void entriesUpdated(Collection<Jid> addresses);
+    void entriesUpdated(Collection<Jid> addresses);
 
     /**
      * Called when a roster entries are removed.
      *
      * @param addresses the XMPP addresses of the contacts that have been removed from the roster.
      */
-    public void entriesDeleted(Collection<Jid> addresses);
+    void entriesDeleted(Collection<Jid> addresses);
 
     /**
      * Called when the presence of a roster entry is changed. Care should be taken
@@ -78,5 +78,5 @@ public interface RosterListener {
      * @param presence the presence that changed.
      * @see Roster#getPresence(org.jxmpp.jid.BareJid)
      */
-    public void presenceChanged(Presence presence);
+    void presenceChanged(Presence presence);
 }
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterLoadedListener.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterLoadedListener.java
index 853cf31f2..765c695b5 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterLoadedListener.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterLoadedListener.java
@@ -33,7 +33,7 @@ public interface RosterLoadedListener {
      *
      * @param roster the Roster that was loaded successfully.
      */
-    public void onRosterLoaded(Roster roster);
+    void onRosterLoaded(Roster roster);
 
     /**
      * Called when roster loading has failed.
@@ -46,6 +46,6 @@ public interface RosterLoadedListener {
      * @param exception the exception which caused the failure.
      * @since 4.2
      */
-    public void onRosterLoadingFailed(Exception exception);
+    void onRosterLoadingFailed(Exception exception);
 
 }
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/SubscribeListener.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/SubscribeListener.java
index 85abba6dd..9d5d281aa 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/roster/SubscribeListener.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/SubscribeListener.java
@@ -31,7 +31,7 @@ import org.jxmpp.jid.Jid;
  */
 public interface SubscribeListener {
 
-    public enum SubscribeAnswer {
+    enum SubscribeAnswer {
         /**
          * Approve the subscription request.
          */
@@ -56,6 +56,6 @@ public interface SubscribeListener {
      * @param subscribeRequest the presence stanza used for the request.
      * @return a answer to the request, or <code>null</code>
      */
-    public SubscribeAnswer processSubscribe(Jid from, Presence subscribeRequest);
+    SubscribeAnswer processSubscribe(Jid from, Presence subscribeRequest);
 
 }
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/packet/RosterPacket.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/packet/RosterPacket.java
index f351e080a..d888f769e 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/roster/packet/RosterPacket.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/packet/RosterPacket.java
@@ -44,7 +44,7 @@ public class RosterPacket extends IQ {
     public static final String ELEMENT = QUERY_ELEMENT;
     public static final String NAMESPACE = "jabber:iq:roster";
 
-    private final List<Item> rosterItems = new ArrayList<Item>();
+    private final List<Item> rosterItems = new ArrayList<>();
     private String rosterVersion;
 
     public RosterPacket() {
@@ -80,7 +80,7 @@ public class RosterPacket extends IQ {
      */
     public List<Item> getRosterItems() {
         synchronized (rosterItems) {
-            return new ArrayList<Item>(rosterItems);
+            return new ArrayList<>(rosterItems);
         }
     }
 
@@ -153,7 +153,7 @@ public class RosterPacket extends IQ {
             this.jid = Objects.requireNonNull(jid);
             this.name = name;
             this.subscriptionPending = subscriptionPending;
-            groupNames = new CopyOnWriteArraySet<String>();
+            groupNames = new CopyOnWriteArraySet<>();
         }
 
         @Override
@@ -341,7 +341,7 @@ public class RosterPacket extends IQ {
 
     }
 
-    public static enum ItemType {
+    public enum ItemType {
 
         /**
          * The user does not have a subscription to the contact's presence, and the contact does not
@@ -379,7 +379,7 @@ public class RosterPacket extends IQ {
 
         private final String symbol;
 
-        private ItemType(char secondSymbolChar) {
+        ItemType(char secondSymbolChar) {
             StringBuilder sb = new StringBuilder(2);
             sb.append(ME).append(secondSymbolChar);
             symbol = sb.toString();
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/rosterstore/DirectoryRosterStore.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/rosterstore/DirectoryRosterStore.java
index 697ea2607..473777569 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/roster/rosterstore/DirectoryRosterStore.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/rosterstore/DirectoryRosterStore.java
@@ -29,7 +29,6 @@ import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jivesoftware.smack.roster.packet.RosterPacket;
 import org.jivesoftware.smack.roster.packet.RosterPacket.Item;
 import org.jivesoftware.smack.roster.provider.RosterPacketProvider;
 import org.jivesoftware.smack.util.FileUtils;
@@ -121,7 +120,7 @@ public final class DirectoryRosterStore implements RosterStore {
 
     @Override
     public List<Item> getEntries() {
-        List<Item> entries = new ArrayList<RosterPacket.Item>();
+        List<Item> entries = new ArrayList<>();
 
         for (File file : fileDir.listFiles(rosterDirFilter)) {
             Item entry = readEntry(file);
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/rosterstore/RosterStore.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/rosterstore/RosterStore.java
index 303735c90..2949fd161 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/roster/rosterstore/RosterStore.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/rosterstore/RosterStore.java
@@ -35,46 +35,46 @@ public interface RosterStore {
      *
      * @return List of {@link org.jivesoftware.smack.roster.RosterEntry} or <code>null</code>.
      */
-    public List<RosterPacket.Item> getEntries();
+    List<RosterPacket.Item> getEntries();
 
     /**
      * This method returns the roster item in this store for the given JID.
      * @param bareJid The bare JID of the RosterEntry
      * @return The {@link org.jivesoftware.smack.roster.RosterEntry} which belongs to that user
      */
-    public RosterPacket.Item getEntry(Jid bareJid);
+    RosterPacket.Item getEntry(Jid bareJid);
     /**
      * This method returns the version number as specified by the "ver" attribute
      * of the local store. For a fresh store, this MUST be the empty string.
      * @return local roster version
      */
-    public String getRosterVersion();
+    String getRosterVersion();
     /**
      * This method stores a new roster entry in this store or updates an existing one.
      * @param item the entry to store
      * @param version the new roster version
      * @return True if successful
      */
-    public boolean addEntry(RosterPacket.Item item, String version);
+    boolean addEntry(RosterPacket.Item item, String version);
     /**
      * This method updates the store so that it contains only the given entries.
      * @param items the entries to store
      * @param version the new roster version
      * @return True if successful
      */
-    public boolean resetEntries(Collection<RosterPacket.Item> items, String version);
+    boolean resetEntries(Collection<RosterPacket.Item> items, String version);
     /**
      * Removes an entry from the store.
      * @param bareJid The bare JID of the entry to be removed
      * @param version the new roster version
      * @return True if successful
      */
-    public boolean removeEntry(Jid bareJid, String version);
+    boolean removeEntry(Jid bareJid, String version);
 
     /**
      * Reset the store by removing all entries and setting the version to the empty String.
      *
      * @since 4.2
      */
-    public void resetStore();
+    void resetStore();
 }
diff --git a/smack-im/src/test/java/org/jivesoftware/smack/chat/ChatConnectionTest.java b/smack-im/src/test/java/org/jivesoftware/smack/chat/ChatConnectionTest.java
index e89f2825a..fab3bb2e4 100644
--- a/smack-im/src/test/java/org/jivesoftware/smack/chat/ChatConnectionTest.java
+++ b/smack-im/src/test/java/org/jivesoftware/smack/chat/ChatConnectionTest.java
@@ -374,12 +374,12 @@ public class ChatConnectionTest {
     }
 
     private static class TestChatServer extends Thread {
-        private Stanza chatPacket;
-        private DummyConnection con;
+        private final Stanza chatPacket;
+        private final DummyConnection con;
 
-        TestChatServer(Stanza chatMsg, DummyConnection conect) {
+        TestChatServer(Stanza chatMsg, DummyConnection connection) {
             chatPacket = chatMsg;
-            con = conect;
+            con = connection;
         }
 
         @Override
diff --git a/smack-im/src/test/java/org/jivesoftware/smack/roster/RosterOfflineTest.java b/smack-im/src/test/java/org/jivesoftware/smack/roster/RosterOfflineTest.java
index 57e8dd3cd..e5ee1334f 100644
--- a/smack-im/src/test/java/org/jivesoftware/smack/roster/RosterOfflineTest.java
+++ b/smack-im/src/test/java/org/jivesoftware/smack/roster/RosterOfflineTest.java
@@ -32,9 +32,9 @@ import org.junit.Test;
  */
 public class RosterOfflineTest {
 
-    DummyConnection connection;
+    private DummyConnection connection;
 
-    Roster roster;
+    private Roster roster;
 
     @Before
     public void setup() {
diff --git a/smack-im/src/test/java/org/jivesoftware/smack/roster/RosterTest.java b/smack-im/src/test/java/org/jivesoftware/smack/roster/RosterTest.java
index 9a857ee5e..c565a295b 100644
--- a/smack-im/src/test/java/org/jivesoftware/smack/roster/RosterTest.java
+++ b/smack-im/src/test/java/org/jivesoftware/smack/roster/RosterTest.java
@@ -387,7 +387,7 @@ public class RosterTest extends InitSmackIm {
         connection.processStanza(packet);
 
         // Smack should reply with an error IQ
-        ErrorIQ errorIQ = (ErrorIQ) connection.getSentPacket();
+        ErrorIQ errorIQ = connection.getSentPacket();
         assertEquals(requestId, errorIQ.getStanzaId());
         assertEquals(Condition.service_unavailable, errorIQ.getError().getCondition());
 
@@ -537,9 +537,7 @@ public class RosterTest extends InitSmackIm {
      * Initialize the roster according to the example in
      * <a href="http://xmpp.org/rfcs/rfc3921.html#roster-login"
      *     >RFC3921: Retrieving One's Roster on Login</a>.
-     * 
-     * @param connection the dummy connection of which the provided roster belongs to.
-     * @param roster the roster (or buddy list) which should be initialized.
+     *
      * @throws SmackException 
      * @throws XmppStringprepException 
      */
diff --git a/smack-im/src/test/java/org/jivesoftware/smack/roster/RosterVersioningTest.java b/smack-im/src/test/java/org/jivesoftware/smack/roster/RosterVersioningTest.java
index 4996e74a6..f840dba96 100644
--- a/smack-im/src/test/java/org/jivesoftware/smack/roster/RosterVersioningTest.java
+++ b/smack-im/src/test/java/org/jivesoftware/smack/roster/RosterVersioningTest.java
@@ -108,13 +108,13 @@ public class RosterVersioningTest {
         Collection<RosterEntry> entries = roster.getEntries();
         assertSame("Size of the roster", 3, entries.size());
 
-        HashSet<Item> items = new HashSet<Item>();
+        HashSet<Item> items = new HashSet<>();
         for (RosterEntry entry : entries) {
             items.add(RosterEntry.toRosterItem(entry));
         }
         RosterStore store = DirectoryRosterStore.init(tmpFolder.newFolder());
         populateStore(store);
-        assertEquals("Elements of the roster", new HashSet<Item>(store.getEntries()), items);
+        assertEquals("Elements of the roster", new HashSet<>(store.getEntries()), items);
 
         for (RosterEntry entry : entries) {
             assertTrue("joe stevens".equals(entry.getName()) || "geoff hurley".equals(entry.getName())
@@ -168,7 +168,7 @@ public class RosterVersioningTest {
         RosterStore store = roster.getRosterStore();
         assertEquals("Size of store", 1, store.getEntries().size());
         Item item = store.getEntry(vaglafItem.getJid());
-        assertNotNull("Store contains vaglaf entry");
+        assertNotNull("Store contains vaglaf entry", item);
         assertEquals("vaglaf entry in store equals the sent entry", vaglafItem, item);
     }
 
@@ -201,11 +201,11 @@ public class RosterVersioningTest {
             assertNotNull("Expect vaglaf to be added", storedItem);
             assertEquals("Expect vaglaf to be equal to pushed item", pushedItem, storedItem);
 
-            Collection<Item> rosterItems = new HashSet<Item>();
+            Collection<Item> rosterItems = new HashSet<>();
             for (RosterEntry entry : roster.getEntries()) {
                 rosterItems.add(RosterEntry.toRosterItem(entry));
             }
-            assertEquals(rosterItems, new HashSet<Item>(store.getEntries()));
+            assertEquals(rosterItems, new HashSet<>(store.getEntries()));
         }
 
         // Simulate a roster push removing vaglaf
diff --git a/smack-im/src/test/java/org/jivesoftware/smack/roster/SubscriptionPreApprovalTest.java b/smack-im/src/test/java/org/jivesoftware/smack/roster/SubscriptionPreApprovalTest.java
index b03275592..64778421b 100644
--- a/smack-im/src/test/java/org/jivesoftware/smack/roster/SubscriptionPreApprovalTest.java
+++ b/smack-im/src/test/java/org/jivesoftware/smack/roster/SubscriptionPreApprovalTest.java
@@ -150,7 +150,7 @@ public class SubscriptionPreApprovalTest extends InitSmackIm {
          */
         abstract void verifyRosterUpdateRequest(final RosterPacket updateRequest);
         /**
-         * Overwrite this method to check if recieved pre-approval request is valid
+         * Overwrite this method to check if received pre-approval request is valid
          *
          * @param preApproval the request which would be sent to server.
          */
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smack/ChatTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smack/ChatTest.java
index 31c3b48fd..48cc5457a 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smack/ChatTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smack/ChatTest.java
@@ -25,11 +25,9 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
 
-import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.chat.ChatManagerListener;
 import org.jivesoftware.smack.filter.ThreadFilter;
 import org.jivesoftware.smack.packet.Message;
-
 import org.jivesoftware.smackx.jiveproperties.JivePropertiesManager;
 
 import org.igniterealtime.smack.inttest.AbstractSmackIntegrationTest;
@@ -37,7 +35,6 @@ import org.igniterealtime.smack.inttest.SmackIntegrationTest;
 import org.igniterealtime.smack.inttest.SmackIntegrationTestEnvironment;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.jxmpp.stringprep.XmppStringprepException;
 
 /**
  * Tests for Chat Manager and for Chat Manager Listener.
@@ -68,7 +65,7 @@ public class ChatTest extends AbstractSmackIntegrationTest {
 
     @SuppressWarnings("deprecation")
     @SmackIntegrationTest
-    public void testProperties() throws XmppStringprepException, NotConnectedException, Exception {
+    public void testProperties() throws Exception {
         org.jivesoftware.smack.chat.Chat newChat = chatManagerOne.createChat(conTwo.getUser());
         StanzaCollector collector = conTwo.createStanzaCollector(new ThreadFilter(newChat.getThreadID()));
 
@@ -85,7 +82,7 @@ public class ChatTest extends AbstractSmackIntegrationTest {
 
         newChat.sendMessage(msg);
 
-        Message msg2 = (Message) collector.nextResult(2000);
+        Message msg2 = collector.nextResult(2000);
         assertNotNull("No message was received", msg2);
         assertEquals("Subjects are different", msg.getSubject(), msg2.getSubject());
         assertEquals("Bodies are different", msg.getBody(), msg2.getBody());
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smack/roster/LowLevelRosterIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smack/roster/LowLevelRosterIntegrationTest.java
index 7312bca44..a492c0bce 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smack/roster/LowLevelRosterIntegrationTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smack/roster/LowLevelRosterIntegrationTest.java
@@ -60,7 +60,7 @@ public class LowLevelRosterIntegrationTest extends AbstractSmackLowLevelIntegrat
             }
         });
 
-        // Disconnect conTwo, this should cause an 'unavilable' presence to be send from conTwo to
+        // Disconnect conTwo, this should cause an 'unavailable' presence to be send from conTwo to
         // conOne.
         conTwo.disconnect();
 
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferIntegrationTest.java
index 0c9063896..0c68de1f2 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferIntegrationTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferIntegrationTest.java
@@ -73,7 +73,7 @@ public class FileTransferIntegrationTest extends AbstractSmackIntegrationTest {
         final FileTransferListener receiveListener = new FileTransferListener() {
             @Override
             public void fileTransferRequest(FileTransferRequest request) {
-                byte[] dataReceived = null;
+                byte[] dataReceived;
                 IncomingFileTransfer ift = request.accept();
                 try {
                     InputStream is = ift.recieveFile();
@@ -105,9 +105,9 @@ public class FileTransferIntegrationTest extends AbstractSmackIntegrationTest {
         while (!oft.isDone()) {
             switch (oft.getStatus()) {
             case error:
-                throw new Exception("Filetransfer error: " + oft.getError());
+                throw new Exception("FileTransfer error: " + oft.getError());
             default:
-                LOGGER.info("Filetransfer status: " + oft.getStatus() + ". Progress: " + oft.getProgress());
+                LOGGER.info("FileTransfer status: " + oft.getStatus() + ". Progress: " + oft.getProgress());
                 break;
             }
             Thread.sleep(1000);
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/httpfileupload/HttpFileUploadIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/httpfileupload/HttpFileUploadIntegrationTest.java
index fc8308947..4c75381bb 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/httpfileupload/HttpFileUploadIntegrationTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/httpfileupload/HttpFileUploadIntegrationTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertArrayEquals;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -62,7 +61,7 @@ public class HttpFileUploadIntegrationTest extends AbstractSmackIntegrationTest
     }
 
     @SmackIntegrationTest
-    public void httpFileUploadTest() throws FileNotFoundException, IOException, XMPPErrorException, InterruptedException, SmackException {
+    public void httpFileUploadTest() throws IOException, XMPPErrorException, InterruptedException, SmackException {
         final int fileSize = FILE_SIZE;
         File file = createNewTempFile();
         FileOutputStream fos = new FileOutputStream(file.getCanonicalPath());
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/IoTControlIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/IoTControlIntegrationTest.java
index 4feebd3c8..17490629a 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/IoTControlIntegrationTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/IoTControlIntegrationTest.java
@@ -57,7 +57,7 @@ public class IoTControlIntegrationTest extends AbstractSmackIntegrationTest {
      */
     @SmackIntegrationTest
     // @SmackSerialIntegrationTest
-    public void controlTest() throws TimeoutException, Exception {
+    public void controlTest() throws Exception {
         final String key = StringUtils.randomString(12);
         final String sn = StringUtils.randomString(12);
         final SimpleResultSyncPoint syncPoint = new SimpleResultSyncPoint();
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/IoTDataIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/IoTDataIntegrationTest.java
index 153e8879f..067367131 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/IoTDataIntegrationTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/IoTDataIntegrationTest.java
@@ -58,7 +58,7 @@ public class IoTDataIntegrationTest extends AbstractSmackIntegrationTest {
      * @throws TimeoutException 
      */
     @SmackIntegrationTest
-    public void dataTest() throws TimeoutException, Exception {
+    public void dataTest() throws Exception {
         final String key = StringUtils.randomString(12);
         final String sn = StringUtils.randomString(12);
         final int value = INSECURE_RANDOM.nextInt();
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatIntegrationTest.java
index cc66c63f3..99ad08aff 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatIntegrationTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatIntegrationTest.java
@@ -17,7 +17,6 @@
 package org.jivesoftware.smackx.muc;
 
 import java.util.List;
-import java.util.concurrent.TimeoutException;
 
 import org.jivesoftware.smack.MessageListener;
 import org.jivesoftware.smack.SmackException.NoResponseException;
@@ -25,7 +24,6 @@ import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.XMPPException.XMPPErrorException;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.util.StringUtils;
-
 import org.jivesoftware.smackx.muc.MultiUserChat.MucCreateConfigFormHandle;
 
 import org.igniterealtime.smack.inttest.AbstractSmackIntegrationTest;
@@ -64,7 +62,7 @@ public class MultiUserChatIntegrationTest extends AbstractSmackIntegrationTest {
     }
 
     @SmackIntegrationTest
-    public void mucTest() throws TimeoutException, Exception {
+    public void mucTest() throws Exception {
         EntityBareJid mucAddress = JidCreate.entityBareFrom(Localpart.from("smack-inttest-" + randomString), mucService.getDomain());
 
         MultiUserChat mucAsSeenByOne = mucManagerOne.getMultiUserChat(mucAddress);
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatLowLevelIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatLowLevelIntegrationTest.java
index e28536e97..f294351b2 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatLowLevelIntegrationTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatLowLevelIntegrationTest.java
@@ -79,7 +79,7 @@ public class MultiUserChatLowLevelIntegrationTest extends AbstractSmackLowLevelI
         connection.connect().login();
 
         // MucBookmarkAutojoinManager is also able to do its task automatically
-        // after every login, it's not determinstic when this will be finished.
+        // after every login, it's not deterministic when this will be finished.
         // So we trigger it manually here.
         MucBookmarkAutojoinManager.getInstanceFor(connection).autojoinBookmarkedConferences();
 
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/AbstractOmemoIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/AbstractOmemoIntegrationTest.java
index faa03adb8..c137b0caa 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/AbstractOmemoIntegrationTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/AbstractOmemoIntegrationTest.java
@@ -33,7 +33,7 @@ import org.junit.BeforeClass;
  */
 public abstract class AbstractOmemoIntegrationTest extends AbstractSmackIntegrationTest {
 
-    static final File storePath;
+    private static final File storePath;
 
     static {
         String userHome = System.getProperty("user.home");
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoSessionRenegotiationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoSessionRenegotiationTest.java
index 4a058df06..1b4542252 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoSessionRenegotiationTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoSessionRenegotiationTest.java
@@ -107,7 +107,7 @@ public class OmemoSessionRenegotiationTest extends AbstractOmemoIntegrationTest
             @Override
             public void onOmemoMessageReceived(String decryptedBody, Message encryptedMessage, Message wrappingMessage, OmemoMessageInformation omemoInformation) {
                 LOGGER.log(Level.INFO, "Alice received OMEMO message: " + decryptedBody);
-                assertEquals("Reply must match the messagewe sent.", decryptedBody, m2);
+                assertEquals("Reply must match the message we sent.", decryptedBody, m2);
                 sp2.signal();
             }
 
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoStoreTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoStoreTest.java
index 663ae948c..6a8a37a20 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoStoreTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoStoreTest.java
@@ -94,12 +94,12 @@ public class OmemoStoreTest extends AbstractOmemoIntegrationTest {
                 store.getDateOfLastReceivedMessage(alice, bob.getOwnDevice()));
         Date now = new Date();
         store.setDateOfLastReceivedMessage(alice, bob.getOwnDevice(), now);
-        assertEquals("Date of last reveived message must match the one we set.",
+        assertEquals("Date of last received message must match the one we set.",
                 now, store.getDateOfLastReceivedMessage(alice, bob.getOwnDevice()));
-        assertNull("Date of last signed prekey renewal must be null.",
+        assertNull("Date of last signed preKey renewal must be null.",
                 store.getDateOfLastSignedPreKeyRenewal(alice));
         store.setDateOfLastSignedPreKeyRenewal(alice, now);
-        assertEquals("Date of last signed prekey renewal must match our date.",
+        assertEquals("Date of last signed preKey renewal must match our date.",
                 now, store.getDateOfLastSignedPreKeyRenewal(alice));
 
         // Keys
diff --git a/smack-integration-test/src/test/java/org/igniterealtime/smack/inttest/util/ResultSyncPointTest.java b/smack-integration-test/src/test/java/org/igniterealtime/smack/inttest/util/ResultSyncPointTest.java
index d6dd8d6b9..37c80af26 100644
--- a/smack-integration-test/src/test/java/org/igniterealtime/smack/inttest/util/ResultSyncPointTest.java
+++ b/smack-integration-test/src/test/java/org/igniterealtime/smack/inttest/util/ResultSyncPointTest.java
@@ -20,7 +20,6 @@ import static org.junit.Assert.assertEquals;
 
 import java.util.concurrent.BrokenBarrierException;
 import java.util.concurrent.CyclicBarrier;
-import java.util.concurrent.TimeoutException;
 
 import org.jivesoftware.smack.util.Async;
 
@@ -29,7 +28,7 @@ import org.junit.Test;
 public class ResultSyncPointTest {
 
     @Test
-    public void testResultSyncPoint() throws InterruptedException, TimeoutException, Exception {
+    public void testResultSyncPoint() throws Exception {
         final String result = "Hip Hip Hurrary!!111!";
         final CyclicBarrier barrier = new CyclicBarrier(2);
         final ResultSyncPoint<String, Exception> rsp = new ResultSyncPoint<>();
@@ -46,7 +45,7 @@ public class ResultSyncPointTest {
     }
 
     @Test(expected = TestException.class)
-    public void exceptionTestResultSyncPoint() throws InterruptedException, TimeoutException, Exception {
+    public void exceptionTestResultSyncPoint() throws Exception {
         final CyclicBarrier barrier = new CyclicBarrier(2);
         final ResultSyncPoint<String, TestException> rsp = new ResultSyncPoint<>();
         Async.go(new Async.ThrowingRunnable() {
diff --git a/smack-java7/src/main/java/org/jivesoftware/smack/java7/XmppHostnameVerifier.java b/smack-java7/src/main/java/org/jivesoftware/smack/java7/XmppHostnameVerifier.java
index d31431406..34a5abd4f 100644
--- a/smack-java7/src/main/java/org/jivesoftware/smack/java7/XmppHostnameVerifier.java
+++ b/smack-java7/src/main/java/org/jivesoftware/smack/java7/XmppHostnameVerifier.java
@@ -214,7 +214,7 @@ public class XmppHostnameVerifier implements HostnameVerifier {
         }
 
         boolean isBeginning = true;
-        String beforeWildcard = "";
+        String beforeWildcard;
         String afterWildcard = template;
         while (wildcardIndex != -1) {
             beforeWildcard = afterWildcard.substring(0, wildcardIndex);
diff --git a/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Base64.java b/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Base64.java
index c2e71e7d8..8cced6183 100644
--- a/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Base64.java
+++ b/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Base64.java
@@ -298,7 +298,7 @@ public final class Base64
 	 * in which case one of them will be picked, though there is
 	 * no guarantee as to which one will be picked.
 	 */
-	private final static byte[] getAlphabet( int options )
+	private static byte[] getAlphabet( int options )
 	{
 		if( (options & URL_SAFE) == URL_SAFE ) return _URL_SAFE_ALPHABET;
 		else if( (options & ORDERED) == ORDERED ) return _ORDERED_ALPHABET;
@@ -314,7 +314,7 @@ public final class Base64
 	 * in which case one of them will be picked, though there is
 	 * no guarantee as to which one will be picked.
 	 */
-	private final static byte[] getDecodabet( int options )
+	private static byte[] getDecodabet( int options )
 	{
 		if( (options & URL_SAFE) == URL_SAFE ) return _URL_SAFE_DECODABET;
 		else if( (options & ORDERED) == ORDERED ) return _ORDERED_DECODABET;
@@ -359,7 +359,7 @@ public final class Base64
      * anywhere along their length by specifying
      * <var>srcOffset</var> and <var>destOffset</var>.
      * This method does not check to make sure your arrays
-     * are large enough to accomodate <var>srcOffset</var> + 3 for
+     * are large enough to accommodate <var>srcOffset</var> + 3 for
      * the <var>source</var> array or <var>destOffset</var> + 4 for
      * the <var>destination</var> array.
      * The actual number of significant bytes in your array is
@@ -710,7 +710,7 @@ public final class Base64
      * anywhere along their length by specifying
      * <var>srcOffset</var> and <var>destOffset</var>.
      * This method does not check to make sure your arrays
-     * are large enough to accomodate <var>srcOffset</var> + 4 for
+     * are large enough to accommodate <var>srcOffset</var> + 4 for
      * the <var>source</var> array or <var>destOffset</var> + 3 for
      * the <var>destination</var> array.
      * This method returns the actual number of bytes that
diff --git a/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64Encoder.java b/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64Encoder.java
index bc211e4ab..da7ba78a6 100644
--- a/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64Encoder.java
+++ b/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64Encoder.java
@@ -26,9 +26,9 @@ import org.jivesoftware.smack.util.StringUtils;
  */
 public final class Java7Base64Encoder implements org.jivesoftware.smack.util.stringencoder.Base64.Encoder {
 
-    private static Java7Base64Encoder instance = new Java7Base64Encoder();
+    private static final Java7Base64Encoder instance = new Java7Base64Encoder();
 
-    private static int BASE64_ENCODER_FLAGS =  Base64.DONT_BREAK_LINES;
+    private static final int BASE64_ENCODER_FLAGS =  Base64.DONT_BREAK_LINES;
 
     private Java7Base64Encoder() {
         // Use getInstance()
diff --git a/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64UrlSafeEncoder.java b/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64UrlSafeEncoder.java
index 0154511b9..201c3a000 100644
--- a/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64UrlSafeEncoder.java
+++ b/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64UrlSafeEncoder.java
@@ -35,9 +35,9 @@ import org.jivesoftware.smack.util.stringencoder.StringEncoder;
  */
 public final class Java7Base64UrlSafeEncoder implements StringEncoder {
 
-    private static Java7Base64UrlSafeEncoder instance = new Java7Base64UrlSafeEncoder();
+    private static final Java7Base64UrlSafeEncoder instance = new Java7Base64UrlSafeEncoder();
 
-    private static int BASE64_ENCODER_FLAGS =  Base64.URL_SAFE | Base64.DONT_BREAK_LINES;
+    private static final int BASE64_ENCODER_FLAGS =  Base64.URL_SAFE | Base64.DONT_BREAK_LINES;
 
     private Java7Base64UrlSafeEncoder() {
         // Use getInstance()
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/ContentNegotiator.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/ContentNegotiator.java
index 5d0bbfef9..bb3d9e697 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/ContentNegotiator.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/ContentNegotiator.java
@@ -46,24 +46,24 @@ public class ContentNegotiator extends JingleNegotiator {
     public static final String INITIATOR = "initiator";
     public static final String RESPONDER = "responder";
 
-    private List<TransportNegotiator> transportNegotiators;
+    private final List<TransportNegotiator> transportNegotiators;
     private MediaNegotiator mediaNeg; // The description...
     private TransportNegotiator transNeg; // and transport negotiators
     private JingleTransportManager jingleTransportManager;
-    private String creator;
-    private String name;
+    private final String creator;
+    private final String name;
     private JingleMediaSession jingleMediaSession = null;
 
     public ContentNegotiator(JingleSession session, String inCreator, String inName) {
         super(session);
         creator = inCreator;
         name = inName;
-        transportNegotiators = new ArrayList<TransportNegotiator>();
+        transportNegotiators = new ArrayList<>();
     }
 
     @Override
     public List<IQ> dispatchIncomingPacket(IQ iq, String id) throws XMPPException, SmackException, InterruptedException {
-        List<IQ> responses = new ArrayList<IQ>();
+        List<IQ> responses = new ArrayList<>();
 
         // First only process IQ packets that contain <content> stanzas that
         // match this media manager.
@@ -203,7 +203,7 @@ public class ContentNegotiator extends JingleNegotiator {
     }
 
     /**
-     * Set TransportNegociator
+     * Set TransportNegotiator
      * 
      * @param transNeg
      *            the transNeg to set
@@ -301,7 +301,7 @@ public class ContentNegotiator extends JingleNegotiator {
             jingleMediaSession.addMediaReceivedListener(session);
             if (jingleMediaSession != null) {
 
-                jingleMediaSession.startTrasmit();
+                jingleMediaSession.startTransmit();
                 jingleMediaSession.startReceive();
 
                 for (TransportCandidate candidate : getTransportNegotiator().getOfferedCandidates())
@@ -319,7 +319,7 @@ public class ContentNegotiator extends JingleNegotiator {
     public void stopJingleMediaSession() {
 
         if (jingleMediaSession != null) {
-            jingleMediaSession.stopTrasmit();
+            jingleMediaSession.stopTransmit();
             jingleMediaSession.stopReceive();
         }
     }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleActionEnum.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleActionEnum.java
index 9c524a7c7..9936e52cd 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleActionEnum.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleActionEnum.java
@@ -38,7 +38,7 @@ public enum JingleActionEnum {
 
     private final String actionCode;
 
-    private JingleActionEnum(String inActionCode) {
+    JingleActionEnum(String inActionCode) {
         actionCode = inActionCode;
     }
 
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleManager.java
index 829fe3029..28bcc2893 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleManager.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleManager.java
@@ -59,14 +59,14 @@ import org.jxmpp.jid.Jid;
  * <p/>
  * To create a Jingle Session you need a Transport method and a Payload type.
  * <p/>
- * A transport method is how it will trasmit and receive network packets. Transport MUST have one or more candidates.
+ * A transport method is how it will transmit and receive network packets. Transport MUST have one or more candidates.
  * A transport candidate is an IP Address with a defined port, that other party must send data to.
  * <p/>
  * A supported payload type, is the data encoding format that the jmf will be transmitted.
  * For instance an Audio Payload "GSM".
  * <p/>
- * A Jingle session negociates a payload type and a pair of transport candidates.
- * Which means that when a Jingle Session is establhished you will have two defined transport candidates with addresses
+ * A Jingle session negotiates a payload type and a pair of transport candidates.
+ * Which means that when a Jingle Session is established you will have two defined transport candidates with addresses
  * and a defined Payload type.
  * In other words, you will have two IP address with their respective ports, and a Codec type defined.
  * <p/>
@@ -75,13 +75,13 @@ import org.jxmpp.jid.Jid;
  * use this class for setting the Jingle parameters, create and receive Jingle Sessions.
  * <p/>
  * In order to use the Jingle, the user must provide a
- * TransportManager that will handle the resolution of potential IP addresses taht can be used to transport the streaming (jmf).
+ * TransportManager that will handle the resolution of potential IP addresses that can be used to transport the streaming (jmf).
  * This TransportManager can be initialized with several default resolvers,
  * including a fixed solver that can be used when the address and port are know
  * in advance.
  * This API have ready to use Transport Managers, for instance: BasicTransportManager, STUNTransportManager, BridgedTransportManager.
  * <p/>
- * You should also especify a JingleMediaManager if you want that JingleManager assume Media control
+ * You should also specify a JingleMediaManager if you want that JingleManager assume Media control
  * Using a JingleMediaManager implementation is the easier way to implement a Jingle Application.
  * <p/>
  * Otherwise before creating an outgoing connection, the user must create jingle session
@@ -192,16 +192,16 @@ public class JingleManager implements JingleSessionListener {
 
     // non-static
 
-    final List<JingleSession> jingleSessions = new ArrayList<JingleSession>();
+    private final List<JingleSession> jingleSessions = new ArrayList<>();
 
     // Listeners for manager events (ie, session requests...)
     private List<JingleSessionRequestListener> jingleSessionRequestListeners;
 
     // Listeners for created JingleSessions
-    private List<CreatedJingleSessionListener> creationListeners = new ArrayList<CreatedJingleSessionListener>();
+    private final List<CreatedJingleSessionListener> creationListeners = new ArrayList<>();
 
     // The XMPP connection
-    private XMPPConnection connection;
+    private final XMPPConnection connection;
 
     // The Media Managers
     private List<JingleMediaManager> jingleMediaManagers;
@@ -211,7 +211,7 @@ public class JingleManager implements JingleSessionListener {
      * If a fully implemented JingleMediaSession is entered, JingleManager manage Jingle signalling and jmf
      *
      * @param connection             XMPP XMPPConnection to be used
-     * @param jingleMediaManagers     an implemeted JingleMediaManager to be used.
+     * @param jingleMediaManagers     an implemented JingleMediaManager to be used.
      * @throws SmackException 
      * @throws XMPPException 
      */
@@ -477,7 +477,7 @@ public class JingleManager implements JingleSessionListener {
             }
         };
 
-        jingleSessionRequestListeners = new ArrayList<JingleSessionRequestListener>();
+        jingleSessionRequestListeners = new ArrayList<>();
 
         // Start a packet listener for session initiation requests
         connection.addAsyncStanzaListener(new StanzaListener() {
@@ -512,7 +512,7 @@ public class JingleManager implements JingleSessionListener {
      */
     void triggerSessionRequested(Jingle initJin) {
 
-        JingleSessionRequestListener[] jingleSessionRequestListeners = null;
+        JingleSessionRequestListener[] jingleSessionRequestListeners;
 
         // Make a synchronized copy of the listenerJingles
         synchronized (this.jingleSessionRequestListeners) {
@@ -537,7 +537,7 @@ public class JingleManager implements JingleSessionListener {
      * @return The session on which the negotiation can be run.
      */
     public JingleSession createOutgoingJingleSession(EntityFullJid responder) throws XMPPException {
-        JingleSession session = new JingleSession(connection, (JingleSessionRequest) null, connection.getUser(), responder, jingleMediaManagers);
+        JingleSession session = new JingleSession(connection, null, connection.getUser(), responder, jingleMediaManagers);
 
         triggerSessionCreated(session);
 
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleNegotiator.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleNegotiator.java
index 84b6c7d98..06e97f572 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleNegotiator.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleNegotiator.java
@@ -49,7 +49,7 @@ public abstract class JingleNegotiator {
 
     protected JingleSession session;
 
-    private final List<JingleListener> listeners = new ArrayList<JingleListener>();
+    private final List<JingleListener> listeners = new ArrayList<>();
 
     private String expectedAckId;
 
@@ -158,7 +158,7 @@ public abstract class JingleNegotiator {
      * @param id
      */
     public void removeExpectedId(String id) {
-        addExpectedId((String) null);
+        addExpectedId(null);
     }
 
     // Listeners
@@ -196,7 +196,7 @@ public abstract class JingleNegotiator {
         ArrayList<JingleListener> result;
 
         synchronized (listeners) {
-            result = new ArrayList<JingleListener>(listeners);
+            result = new ArrayList<>(listeners);
         }
 
         return result;
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java
index cda33ae3b..aaa0ca9fe 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java
@@ -67,7 +67,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
     private static final Logger LOGGER = Logger.getLogger(JingleSession.class.getName());
 
     // static
-    private static final HashMap<XMPPConnection, JingleSession> sessions = new HashMap<XMPPConnection, JingleSession>();
+    private static final HashMap<XMPPConnection, JingleSession> sessions = new HashMap<>();
 
     private static final Random randomGenerator = new Random();
 
@@ -79,23 +79,23 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
 
     private String sid; // A unique id that identifies this session
 
-    ConnectionListener connectionListener;
+    private ConnectionListener connectionListener;
 
-    StanzaListener packetListener;
+    private StanzaListener packetListener;
 
-    StanzaFilter packetFilter;
+    private StanzaFilter packetFilter;
 
     protected List<JingleMediaManager> jingleMediaManagers = null;
 
     private JingleSessionState sessionState;
 
-    private List<ContentNegotiator> contentNegotiators;
+    private final List<ContentNegotiator> contentNegotiators;
 
-    private XMPPConnection connection;
+    private final XMPPConnection connection;
 
     private String sessionInitPacketID;
 
-    private Map<String, JingleMediaSession> mediaSessionMap;
+    private final Map<String, JingleMediaSession> mediaSessionMap;
 
     /**
      * Full featured JingleSession constructor.
@@ -125,10 +125,10 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
         // Initially, we don't known the session state.
         setSessionState(JingleSessionStateUnknown.getInstance());
 
-        contentNegotiators = new ArrayList<ContentNegotiator>();
-        mediaSessionMap = new HashMap<String, JingleMediaSession>();
+        contentNegotiators = new ArrayList<>();
+        mediaSessionMap = new HashMap<>();
 
-        // Add the session to the list and register the listeneres
+        // Add the session to the list and register the listeners
         registerInstance();
         installConnectionListeners(conn);
     }
@@ -284,9 +284,9 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
      * @throws InterruptedException 
      */
     public synchronized void receivePacketAndRespond(IQ iq) throws XMPPException, SmackException, InterruptedException {
-        List<IQ> responses = new ArrayList<IQ>();
+        List<IQ> responses = new ArrayList<>();
 
-        String responseId = null;
+        String responseId;
 
         LOGGER.fine("Packet: " + iq.toXML());
 
@@ -355,7 +355,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
      */
     @Override
     public List<IQ> dispatchIncomingPacket(IQ iq, String id) throws XMPPException, SmackException, InterruptedException {
-        List<IQ> responses = new ArrayList<IQ>();
+        List<IQ> responses = new ArrayList<>();
         IQ response = null;
 
         if (iq != null) {
@@ -437,7 +437,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
      * incoming packet.
      * 
      * @param iq
-     *            The Jingle stanza(/packet) we are responing to
+     *            The Jingle stanza(/packet) we are responding to
      * @param jout
      *            the Jingle stanza(/packet) we want to complete and send
      * @throws NotConnectedException 
@@ -1041,11 +1041,11 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
 
     /**
      * Complete and send an error. Complete all the null fields in an IQ error
-     * reponse, using the sesssion information we have or some info from the
+     * response, using the session information we have or some info from the
      * incoming packet.
      * 
      * @param iq
-     *            The Jingle stanza(/packet) we are responing to
+     *            The Jingle stanza(/packet) we are responding to
      * @param jingleError
      *            the IQ stanza(/packet) we want to complete and send
      */
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionRequest.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionRequest.java
index 8ae50fa98..3ad9cc414 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionRequest.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionRequest.java
@@ -31,7 +31,7 @@ import org.jxmpp.jid.Jid;
  * <p/>
  * This class is a facade of a received Jingle request. The user can have direct
  * access to the Jingle stanza(/packet) (<i>JingleSessionRequest.getJingle() </i>) of
- * the request or can use the convencience methods provided by this class.
+ * the request or can use the convenience methods provided by this class.
  *
  * @author Alvaro Saurin
  */
@@ -46,11 +46,11 @@ public class JingleSessionRequest {
     // request
 
     /**
-     * A recieve request is constructed from the Jingle Initiation request
-     * received from the initator.
+     * A receive request is constructed from the Jingle Initiation request
+     * received from the initiator.
      *
      * @param manager The manager handling this request
-     * @param jingle  The jingle IQ recieved from the initiator.
+     * @param jingle  The jingle IQ received from the initiator.
      */
     public JingleSessionRequest(JingleManager manager, Jingle jingle) {
         this.manager = manager;
@@ -113,7 +113,7 @@ public class JingleSessionRequest {
      * @throws InterruptedException 
      */
     public synchronized JingleSession accept() throws XMPPException, SmackException, InterruptedException {
-        JingleSession session = null;
+        JingleSession session;
         synchronized (manager) {
             session = manager.createIncomingJingleSession(this);
             // Acknowledge the IQ reception
@@ -129,7 +129,7 @@ public class JingleSessionRequest {
      * Rejects the session request.
      */
     public synchronized void reject() {
-        JingleSession session = null;
+        JingleSession session;
         synchronized (manager) {
             try {
                 session = manager.createIncomingJingleSession(this);
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateEnded.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateEnded.java
index 86fafa055..94248f864 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateEnded.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateEnded.java
@@ -68,7 +68,7 @@ public class JingleSessionStateEnded extends JingleSessionState {
      */
     @Override
     public IQ processJingle(JingleSession session, Jingle jingle, JingleActionEnum action) {
-        IQ response = null;
+        IQ response;
 
         response = session.createJingleError(jingle, JingleError.MALFORMED_STANZA);
 
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateUnknown.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateUnknown.java
index 1725e07a4..26900d95d 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateUnknown.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateUnknown.java
@@ -74,7 +74,7 @@ public class JingleSessionStateUnknown extends JingleSessionState {
 
     @Override
     public IQ processJingle(JingleSession session, Jingle jingle, JingleActionEnum action) throws SmackException, InterruptedException {
-        IQ response = null;
+        IQ response;
 
         switch (action) {
             case SESSION_INITIATE:
@@ -103,7 +103,7 @@ public class JingleSessionStateUnknown extends JingleSessionState {
 
     private IQ receiveSessionInitiateAction(JingleSession session, Jingle inJingle) throws SmackException, InterruptedException {
 
-        IQ response = null;
+        IQ response;
         boolean shouldAck = true;
 
         // According to XEP-166 when we get a session-initiate we need to check for:
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/CreatedJingleSessionListener.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/CreatedJingleSessionListener.java
index 27b53b604..8a75d3e42 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/CreatedJingleSessionListener.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/CreatedJingleSessionListener.java
@@ -25,6 +25,6 @@ import org.jivesoftware.smackx.jingleold.JingleSession;
  */
 public interface CreatedJingleSessionListener {
 
-    public void sessionCreated(JingleSession jingleSession);
+    void sessionCreated(JingleSession jingleSession);
 
 }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleMediaInfoListener.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleMediaInfoListener.java
index fa118d7f5..7762f21cc 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleMediaInfoListener.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleMediaInfoListener.java
@@ -24,25 +24,25 @@ public interface JingleMediaInfoListener extends JingleListener {
     /**
      * The other end is busy.
      */
-    public void mediaInfoBusy();
+    void mediaInfoBusy();
 
     /**
      * We are on hold.
      */
-    public void mediaInfoHold();
+    void mediaInfoHold();
 
     /**
      * The jmf is muted.
      */
-    public void mediaInfoMute();
+    void mediaInfoMute();
 
     /**
      * We are queued.
      */
-    public void mediaInfoQueued();
+    void mediaInfoQueued();
 
     /**
      * We are ringing.
      */
-    public void mediaInfoRinging();
+    void mediaInfoRinging();
 }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleMediaListener.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleMediaListener.java
index 617572dcb..dd65035d4 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleMediaListener.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleMediaListener.java
@@ -33,12 +33,12 @@ public interface JingleMediaListener extends JingleListener {
      * @throws NotConnectedException 
      * @throws InterruptedException 
      */
-    public void mediaEstablished(PayloadType pt) throws NotConnectedException, InterruptedException;
+    void mediaEstablished(PayloadType pt) throws NotConnectedException, InterruptedException;
 
     /**
      * Notification that a payload type must be cancelled.
      *
      * @param cand The payload type that must be closed
      */
-    public void mediaClosed(PayloadType cand);
+    void mediaClosed(PayloadType cand);
 }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleSessionListener.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleSessionListener.java
index 1ec07e8df..7b6f8d9a0 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleSessionListener.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleSessionListener.java
@@ -40,7 +40,7 @@ public interface JingleSessionListener extends JingleListener {
      * @throws NotConnectedException 
      * @throws InterruptedException 
      */
-    public void sessionEstablished(PayloadType pt, TransportCandidate remoteCandidate,
+    void sessionEstablished(PayloadType pt, TransportCandidate remoteCandidate,
                                    TransportCandidate localCandidate, JingleSession jingleSession) throws NotConnectedException, InterruptedException;
 
     /**
@@ -49,7 +49,7 @@ public interface JingleSessionListener extends JingleListener {
      * @param reason        the reason (if any).
      * @param jingleSession Session that called the method
      */
-    public void sessionDeclined(String reason, JingleSession jingleSession);
+    void sessionDeclined(String reason, JingleSession jingleSession);
 
     /**
      * Notification that the session was redirected.
@@ -57,7 +57,7 @@ public interface JingleSessionListener extends JingleListener {
      * @param redirection
      * @param jingleSession session that called the method
      */
-    public void sessionRedirected(String redirection, JingleSession jingleSession);
+    void sessionRedirected(String redirection, JingleSession jingleSession);
 
     /**
      * Notification that the session was closed normally.
@@ -65,7 +65,7 @@ public interface JingleSessionListener extends JingleListener {
      * @param reason        the reason (if any).
      * @param jingleSession Session that called the method
      */
-    public void sessionClosed(String reason, JingleSession jingleSession);
+    void sessionClosed(String reason, JingleSession jingleSession);
 
     /**
      * Notification that the session was closed due to an exception.
@@ -73,7 +73,7 @@ public interface JingleSessionListener extends JingleListener {
      * @param e             the exception.
      * @param jingleSession session that called the method
      */
-    public void sessionClosedOnError(XMPPException e, JingleSession jingleSession);
+    void sessionClosedOnError(XMPPException e, JingleSession jingleSession);
 
     /**
      * Notification that the Media has arrived for this session.
@@ -81,6 +81,6 @@ public interface JingleSessionListener extends JingleListener {
      * @param jingleSession session that called the method
      * @param participant description of the participant
      */
-    public void sessionMediaReceived(JingleSession jingleSession, String participant);
+    void sessionMediaReceived(JingleSession jingleSession, String participant);
 
 }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleSessionRequestListener.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleSessionRequestListener.java
index 7ae79b44b..9ae3f610e 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleSessionRequestListener.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleSessionRequestListener.java
@@ -25,9 +25,9 @@ import org.jivesoftware.smackx.jingleold.JingleSessionRequest;
  */
 public interface JingleSessionRequestListener extends JingleListener {
     /**
-     * A request to start a session has been recieved from another user.
+     * A request to start a session has been received from another user.
      *
      * @param request The request from the other user.
      */
-    public void sessionRequested(JingleSessionRequest request);
+    void sessionRequested(JingleSessionRequest request);
 }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleTransportListener.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleTransportListener.java
index 8d7161f69..5929fa561 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleTransportListener.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleTransportListener.java
@@ -38,7 +38,7 @@ public interface JingleTransportListener extends JingleListener {
      * @throws NotConnectedException 
      * @throws InterruptedException 
      */
-    public void transportEstablished(TransportCandidate local,
+    void transportEstablished(TransportCandidate local,
                                      TransportCandidate remote) throws NotConnectedException, InterruptedException;
 
     /**
@@ -47,13 +47,13 @@ public interface JingleTransportListener extends JingleListener {
      * @param cand The transport candidate that must be cancelled. A value
      *             of "null" means all the transports for this session.
      */
-    public void transportClosed(TransportCandidate cand);
+    void transportClosed(TransportCandidate cand);
 
     /**
      * Notification that the transport was closed due to an exception.
      *
      * @param e the exception.
      */
-    public void transportClosedOnError(XMPPException e);
+    void transportClosedOnError(XMPPException e);
 }
 
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/JingleMediaManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/JingleMediaManager.java
index 4b534008c..2c28d0598 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/JingleMediaManager.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/JingleMediaManager.java
@@ -37,7 +37,7 @@ public abstract class JingleMediaManager {
     public static final String MEDIA_NAME = "JingleMediaManager";
 
     // Each media manager must keep track of the transport manager that it uses.
-    private JingleTransportManager transportManager;
+    private final JingleTransportManager transportManager;
 
     public JingleMediaManager(JingleTransportManager transportManager) {
         this.transportManager = transportManager;
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/JingleMediaSession.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/JingleMediaSession.java
index 6559b5cb3..18b60fb0b 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/JingleMediaSession.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/JingleMediaSession.java
@@ -45,14 +45,14 @@ public abstract class JingleMediaSession {
     // Media Locator
     private String mediaLocator;
     // Media Received Listener
-    private List<MediaReceivedListener> mediaReceivedListeners = new ArrayList<MediaReceivedListener>();
+    private List<MediaReceivedListener> mediaReceivedListeners = new ArrayList<>();
     // Jingle Session
     private JingleSession jingleSession;
 
     /**
      * Creates a new JingleMediaSession Instance to handle Media methods.
      *
-     * @param payloadType  Payload Type of the transmittion
+     * @param payloadType  Payload Type of the transmission
      * @param remote       Remote accepted Transport Candidate
      * @param local        Local accepted Transport Candidate
      * @param mediaLocator Media Locator of the capture device
@@ -144,7 +144,7 @@ public abstract class JingleMediaSession {
     /**
      * Starts a RTP / UDP / TCP Transmission to the remote Candidate.
      */
-    public abstract void startTrasmit();
+    public abstract void startTransmit();
 
     /**
      * Starts a RTP / UDP / TCP Receiver from the remote Candidate to local Candidate.
@@ -157,12 +157,12 @@ public abstract class JingleMediaSession {
      *
      * @param active
      */
-    public abstract void setTrasmit(boolean active);
+    public abstract void setTransmit(boolean active);
 
     /**
      * Stops a RTP / UDP / TCP Transmission to the remote Candidate.
      */
-    public abstract void stopTrasmit();
+    public abstract void stopTransmit();
 
     /**
      * Stops a RTP / UDP / TCP Receiver from the remote Candidate to local Candidate.
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaNegotiator.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaNegotiator.java
index 656fe6f65..9b6600ecd 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaNegotiator.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaNegotiator.java
@@ -55,9 +55,9 @@ public class MediaNegotiator extends JingleNegotiator {
 
     // Local and remote payload types...
 
-    private final List<PayloadType> localAudioPts = new ArrayList<PayloadType>();
+    private final List<PayloadType> localAudioPts = new ArrayList<>();
 
-    private final List<PayloadType> remoteAudioPts = new ArrayList<PayloadType>();
+    private final List<PayloadType> remoteAudioPts = new ArrayList<>();
 
     private PayloadType bestCommonAudioPt;
 
@@ -108,7 +108,7 @@ public class MediaNegotiator extends JingleNegotiator {
      */
     @Override
     public List<IQ> dispatchIncomingPacket(IQ iq, String id) throws XMPPException, NotConnectedException, InterruptedException {
-        List<IQ> responses = new ArrayList<IQ>();
+        List<IQ> responses = new ArrayList<>();
         IQ response = null;
 
         if (iq.getType().equals(IQ.Type.error)) {
@@ -185,7 +185,7 @@ public class MediaNegotiator extends JingleNegotiator {
 //            // Calculate the best common codec
 //            bestCommonAudioPt = calculateBestCommonAudioPt(remoteAudioPts);
 //
-//            // and send an accept if we havee an agreement...
+//            // and send an accept if we have an agreement...
 //            if (bestCommonAudioPt != null) {
 //                response = createAcceptMessage();
 //            } else {
@@ -208,10 +208,9 @@ public class MediaNegotiator extends JingleNegotiator {
      * @throws InterruptedException 
       */
     private IQ receiveContentAcceptAction(Jingle jingle, JingleDescription description) throws XMPPException, NotConnectedException, InterruptedException {
-        IQ response = null;
-        List<PayloadType> offeredPayloads = new ArrayList<PayloadType>();
+        IQ response;
 
-        offeredPayloads = description.getAudioPayloadTypesList();
+        List<PayloadType> offeredPayloads = description.getAudioPayloadTypesList();
         bestCommonAudioPt = calculateBestCommonAudioPt(offeredPayloads);
 
         if (bestCommonAudioPt == null) {
@@ -240,9 +239,7 @@ public class MediaNegotiator extends JingleNegotiator {
     private IQ receiveSessionInitiateAction(Jingle jingle, JingleDescription description) {
         IQ response = null;
 
-        List<PayloadType> offeredPayloads = new ArrayList<PayloadType>();
-
-        offeredPayloads = description.getAudioPayloadTypesList();
+        List<PayloadType> offeredPayloads = description.getAudioPayloadTypesList();
         bestCommonAudioPt = calculateBestCommonAudioPt(offeredPayloads);
 
         synchronized (remoteAudioPts) {
@@ -251,7 +248,7 @@ public class MediaNegotiator extends JingleNegotiator {
 
         // If there are suitable/matching payload types then accept this content.
         if (bestCommonAudioPt != null) {
-            // Let thre transport negotiators sort-out connectivity and content-accept instead.
+            // Let the transport negotiators sort-out connectivity and content-accept instead.
             // response = createAudioPayloadTypesOffer();
             setNegotiatorState(JingleNegotiatorState.PENDING);
         } else {
@@ -266,7 +263,7 @@ public class MediaNegotiator extends JingleNegotiator {
      * A content info has been received. This is done for publishing the
      * list of payload types...
      * 
-     * @param jin
+     * @param jingle
      *            The input packet
      * @return a Jingle packet
      * @throws JingleException
@@ -314,7 +311,6 @@ public class MediaNegotiator extends JingleNegotiator {
     private IQ receiveSessionAcceptAction(Jingle jingle, JingleDescription description) throws JingleException {
         IQ response = null;
         PayloadType.Audio agreedCommonAudioPt;
-        List<PayloadType> offeredPayloads = new ArrayList<PayloadType>();
 
         if (bestCommonAudioPt == null) {
             // Update the best common audio PT
@@ -322,7 +318,7 @@ public class MediaNegotiator extends JingleNegotiator {
             // response = createAcceptMessage();
         }
 
-        offeredPayloads = description.getAudioPayloadTypesList();
+        List<PayloadType> offeredPayloads = description.getAudioPayloadTypesList();
         if (!offeredPayloads.isEmpty()) {
             if (offeredPayloads.size() == 1) {
                 agreedCommonAudioPt = (PayloadType.Audio) offeredPayloads.get(0);
@@ -363,8 +359,8 @@ public class MediaNegotiator extends JingleNegotiator {
     // Payload types
 
     private PayloadType calculateBestCommonAudioPt(List<PayloadType> remoteAudioPts) {
-        final ArrayList<PayloadType> commonAudioPtsHere = new ArrayList<PayloadType>();
-        final ArrayList<PayloadType> commonAudioPtsThere = new ArrayList<PayloadType>();
+        final ArrayList<PayloadType> commonAudioPtsHere = new ArrayList<>();
+        final ArrayList<PayloadType> commonAudioPtsThere = new ArrayList<>();
         PayloadType result = null;
 
         if (!remoteAudioPts.isEmpty()) {
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaReceivedListener.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaReceivedListener.java
index 5c564a722..2a4997dcf 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaReceivedListener.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaReceivedListener.java
@@ -24,6 +24,6 @@ public interface MediaReceivedListener {
     /**
      * Called when new Media is received.
      */
-    public void mediaReceived(String participant);
+    void mediaReceived(String participant);
 
 }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/PayloadType.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/PayloadType.java
index bd1215006..ef8f6a04b 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/PayloadType.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/PayloadType.java
@@ -121,7 +121,7 @@ public class PayloadType {
     }
 
     /**
-     * Set the numer of channels for a payload type.
+     * Set the number of channels for a payload type.
      *
      * @param channels The number of channels
      */
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/JMFInit.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/JMFInit.java
index 6d718c423..a0a18b284 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/JMFInit.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/JMFInit.java
@@ -250,7 +250,7 @@ public class JMFInit extends Frame implements Runnable {
                         plType);
                 int listSize = rendList.size();
                 boolean found = false;
-                String rname = null;
+                String rname;
 
                 for (int i = 0; i < listSize; i++) {
                     rname = rendList.elementAt(i);
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioChannel.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioChannel.java
index 488354f00..0976aa5b3 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioChannel.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioChannel.java
@@ -63,7 +63,7 @@ import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
  * Receiving
  * portB ---> portA
  * <p/>
- * <i>Transmit and Receive are interdependents. To receive you MUST trasmit. </i>
+ * <i>Transmit and Receive are interdependence. To receive you MUST transmit. </i>
  *
  * @author Thiago Camargo
  */
@@ -83,7 +83,7 @@ public class AudioChannel {
     private DataSource dataOutput = null;
     private AudioReceiver audioReceiver;
 
-    private List<SendStream> sendStreams = new ArrayList<SendStream>();
+    private List<SendStream> sendStreams = new ArrayList<>();
 
     private JingleMediaSession jingleMediaSession;
 
@@ -220,7 +220,7 @@ public class AudioChannel {
         // Get the tracks from the processor
         TrackControl[] tracks = processor.getTrackControls();
 
-        // Do we have atleast one track?
+        // Do we have at least one track?
         if (tracks == null || tracks.length < 1) {
             return "Couldn't find tracks in processor";
         }
@@ -404,7 +404,7 @@ public class AudioChannel {
     }
 
     /**
-     * Set transmit activity. If the active is true, the instance should trasmit.
+     * Set transmit activity. If the active is true, the instance should transmit.
      * If it is set to false, the instance should pause transmit.
      *
      * @param active active state
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioMediaSession.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioMediaSession.java
index 7848c792e..c67f8d1e5 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioMediaSession.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioMediaSession.java
@@ -30,8 +30,8 @@ import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
 
 /**
  * This Class implements a complete JingleMediaSession.
- * It sould be used to transmit and receive audio captured from the Mic.
- * This Class should be automaticly controlled by JingleSession.
+ * It should be used to transmit and receive audio captured from the Mic.
+ * This Class should be automatically controlled by JingleSession.
  * But you could also use in any VOIP application.
  * For better NAT Traversal support this implementation don't support only receive or only transmit.
  * To receive you MUST transmit. So the only implemented and functionally methods are startTransmit() and stopTransmit()
@@ -92,7 +92,7 @@ public class AudioMediaSession extends JingleMediaSession {
      * Starts transmission and for NAT Traversal reasons start receiving also.
      */
     @Override
-    public void startTrasmit() {
+    public void startTransmit() {
         audioChannel.start();
     }
 
@@ -103,7 +103,7 @@ public class AudioMediaSession extends JingleMediaSession {
      * @param active active state
      */
     @Override
-    public void setTrasmit(boolean active) {
+    public void setTransmit(boolean active) {
         audioChannel.setTrasmit(active);
     }
 
@@ -119,7 +119,7 @@ public class AudioMediaSession extends JingleMediaSession {
      * Stops transmission and for NAT Traversal reasons stop receiving also.
      */
     @Override
-    public void stopTrasmit() {
+    public void stopTransmit() {
         if (audioChannel != null)
             audioChannel.stop();
     }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioReceiver.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioReceiver.java
index 0f26d5463..4433b5c5b 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioReceiver.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioReceiver.java
@@ -93,10 +93,10 @@ public class AudioReceiver implements ReceiveStreamListener, SessionListener,
                 // Find out the formats.
                 RTPControl ctl = (RTPControl) ds.getControl("javax.jmf.rtp.RTPControl");
                 if (ctl != null) {
-                    LOGGER.severe("  - Recevied new RTP stream: " + ctl.getFormat());
+                    LOGGER.severe("  - Received new RTP stream: " + ctl.getFormat());
                 }
                 else
-                    LOGGER.severe("  - Recevied new RTP stream");
+                    LOGGER.severe("  - Received new RTP stream");
 
                 if (participant == null)
                     LOGGER.severe("      The sender of this stream had yet to be identified.");
@@ -113,7 +113,7 @@ public class AudioReceiver implements ReceiveStreamListener, SessionListener,
                 p.realize();
                 jingleMediaSession.mediaReceived(participant != null ? participant.getCNAME() : "");
 
-                // Notify intialize() that a new stream had arrived.
+                // Notify initialize() that a new stream had arrived.
                 synchronized (dataSync) {
                     dataReceived = true;
                     dataSync.notifyAll();
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/JmfMediaManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/JmfMediaManager.java
index 108c5aea1..dc20a6844 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/JmfMediaManager.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/JmfMediaManager.java
@@ -33,7 +33,7 @@ import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
 
 /**
  * Implements a jingleMediaManager using JMF based API.
- * It supports GSM and G723 codecs.
+ * It supports GSM and G723 codices.
  * <i>This API only currently works on windows and Mac.</i>
  *
  * @author Thiago Camargo
@@ -45,7 +45,7 @@ public class JmfMediaManager extends JingleMediaManager {
     public static final String MEDIA_NAME = "JMF";
 
 
-    private List<PayloadType> payloads = new ArrayList<PayloadType>();
+    private List<PayloadType> payloads = new ArrayList<>();
     private String mediaLocator = null;
 
     /**
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/AudioMediaSession.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/AudioMediaSession.java
index aa72de41d..656182767 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/AudioMediaSession.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/AudioMediaSession.java
@@ -41,8 +41,8 @@ import mil.jfcom.cie.media.srtp.packetizer.SpeexFormat;
 
 /**
  * This Class implements a complete JingleMediaSession.
- * It sould be used to transmit and receive audio captured from the Mic.
- * This Class should be automaticly controlled by JingleSession.
+ * It should be used to transmit and receive audio captured from the Mic.
+ * This Class should be automatically controlled by JingleSession.
  * But you could also use in any VOIP application.
  * For better NAT Traversal support this implementation don't support only receive or only transmit.
  * To receive you MUST transmit. So the only implemented and functionally methods are startTransmit() and stopTransmit()
@@ -157,7 +157,7 @@ public class AudioMediaSession extends JingleMediaSession implements MediaSessio
      * Starts transmission and for NAT Traversal reasons start receiving also.
      */
     @Override
-    public void startTrasmit() {
+    public void startTransmit() {
         try {
             LOGGER.fine("start");
             mediaSession.start(true);
@@ -169,13 +169,13 @@ public class AudioMediaSession extends JingleMediaSession implements MediaSessio
     }
 
     /**
-     * Set transmit activity. If the active is true, the instance should trasmit.
+     * Set transmit activity. If the active is true, the instance should transmit.
      * If it is set to false, the instance should pause transmit.
      *
      * @param active active state
      */
     @Override
-    public void setTrasmit(boolean active) {
+    public void setTransmit(boolean active) {
         // Do nothing
     }
 
@@ -191,7 +191,7 @@ public class AudioMediaSession extends JingleMediaSession implements MediaSessio
      * Stops transmission and for NAT Traversal reasons stop receiving also.
      */
     @Override
-    public void stopTrasmit() {
+    public void stopTransmit() {
         if (mediaSession != null)
             mediaSession.close();
     }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/SpeexMediaManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/SpeexMediaManager.java
index 145382822..ff4df0161 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/SpeexMediaManager.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/SpeexMediaManager.java
@@ -44,7 +44,7 @@ public class SpeexMediaManager extends JingleMediaManager {
 
     public static final String MEDIA_NAME = "Speex";
 
-    private List<PayloadType> payloads = new ArrayList<PayloadType>();
+    private List<PayloadType> payloads = new ArrayList<>();
 
     public SpeexMediaManager(JingleTransportManager transportManager) {
         super(transportManager);
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/multi/MultiMediaManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/multi/MultiMediaManager.java
index a0587b415..515164277 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/multi/MultiMediaManager.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/multi/MultiMediaManager.java
@@ -28,7 +28,7 @@ import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
 
 /**
  * Implements a MultiMediaManager using other JingleMediaManager implementations.
- * It supports every Codecs that JingleMediaManagers added has.
+ * It supports every Codec that JingleMediaManagers added has.
  *
  * @author Thiago Camargo
  */
@@ -37,7 +37,7 @@ public class MultiMediaManager extends JingleMediaManager {
 
     public static final String MEDIA_NAME = "Multi";
 
-    private List<JingleMediaManager> managers = new ArrayList<JingleMediaManager>();
+    private static final List<JingleMediaManager> managers = new ArrayList<>();
 
     private PayloadType preferredPayloadType = null;
 
@@ -60,7 +60,7 @@ public class MultiMediaManager extends JingleMediaManager {
      */
     @Override
     public List<PayloadType> getPayloads() {
-        List<PayloadType> list = new ArrayList<PayloadType>();
+        List<PayloadType> list = new ArrayList<>();
         if (preferredPayloadType != null) list.add(preferredPayloadType);
         for (JingleMediaManager manager : managers) {
             for (PayloadType payloadType : manager.getPayloads()) {
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareMediaManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareMediaManager.java
index 60c882236..80fb7be0f 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareMediaManager.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareMediaManager.java
@@ -39,7 +39,7 @@ public class ScreenShareMediaManager extends JingleMediaManager {
 
     public static final String MEDIA_NAME = "ScreenShare";
 
-    private List<PayloadType> payloads = new ArrayList<PayloadType>();
+    private List<PayloadType> payloads = new ArrayList<>();
 
     private ImageDecoder decoder = null;
     private ImageEncoder encoder = null;
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareSession.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareSession.java
index f7bb39069..8da3be121 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareSession.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareSession.java
@@ -41,8 +41,8 @@ import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
 
 /**
  * This Class implements a complete JingleMediaSession.
- * It sould be used to transmit and receive captured images from the Display.
- * This Class should be automaticly controlled by JingleSession.
+ * It should be used to transmit and receive captured images from the Display.
+ * This Class should be automatically controlled by JingleSession.
  * For better NAT Traversal support this implementation don't support only receive or only transmit.
  * To receive you MUST transmit. So the only implemented and functionally methods are startTransmit() and stopTransmit()
  *
@@ -123,18 +123,18 @@ public class ScreenShareSession extends JingleMediaSession {
      * Starts transmission and for NAT Traversal reasons start receiving also.
      */
     @Override
-    public void startTrasmit() {
+    public void startTransmit() {
         new Thread(transmitter).start();
     }
 
     /**
-     * Set transmit activity. If the active is true, the instance should trasmit.
+     * Set transmit activity. If the active is true, the instance should transmit.
      * If it is set to false, the instance should pause transmit.
      *
      * @param active active state
      */
     @Override
-    public void setTrasmit(boolean active) {
+    public void setTransmit(boolean active) {
         transmitter.setTransmit(true);
     }
 
@@ -150,7 +150,7 @@ public class ScreenShareSession extends JingleMediaSession {
      * Stops transmission and for NAT Traversal reasons stop receiving also.
      */
     @Override
-    public void stopTrasmit() {
+    public void stopTransmit() {
         if (transmitter != null) {
             transmitter.stop();
         }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/AbstractBufferedImageOp.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/AbstractBufferedImageOp.java
index 581e4c6eb..3c9e3cbe4 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/AbstractBufferedImageOp.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/AbstractBufferedImageOp.java
@@ -60,8 +60,8 @@ public abstract class AbstractBufferedImageOp implements BufferedImageOp, Clonea
      * @param image   a BufferedImage object
      * @param x       the left edge of the pixel block
      * @param y       the right edge of the pixel block
-     * @param width   the width of the pixel arry
-     * @param height  the height of the pixel arry
+     * @param width   the width of the pixel array
+     * @param height  the height of the pixel array
      * @param pixels  the array to hold the returned pixels. May be null.
      * @return the pixels
      * @see #setRGB
@@ -79,8 +79,8 @@ public abstract class AbstractBufferedImageOp implements BufferedImageOp, Clonea
      * @param image   a BufferedImage object
      * @param x       the left edge of the pixel block
      * @param y       the right edge of the pixel block
-     * @param width   the width of the pixel arry
-     * @param height  the height of the pixel arry
+     * @param width   the width of the pixel array
+     * @param height  the height of the pixel array
      * @param pixels  the array of pixels to set
      * @see #getRGB
      */
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageDecoder.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageDecoder.java
index 10abde173..d54282a88 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageDecoder.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageDecoder.java
@@ -27,5 +27,5 @@ import java.io.IOException;
  */
 public interface ImageDecoder {
 
-    public BufferedImage decode(ByteArrayInputStream stream) throws IOException;
+    BufferedImage decode(ByteArrayInputStream stream) throws IOException;
 }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageEncoder.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageEncoder.java
index 034574d7d..8607b2d40 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageEncoder.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageEncoder.java
@@ -25,5 +25,5 @@ import java.io.ByteArrayOutputStream;
  * @author Thiago Rocha Camargo
  */
 public interface ImageEncoder {
-    public ByteArrayOutputStream encode(BufferedImage bufferedImage);
+    ByteArrayOutputStream encode(BufferedImage bufferedImage);
 }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/OctTreeQuantizer.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/OctTreeQuantizer.java
index 48271a50a..ab2b756ba 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/OctTreeQuantizer.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/OctTreeQuantizer.java
@@ -37,7 +37,7 @@ public class OctTreeQuantizer implements Quantizer {
     final static int MAX_LEVEL = 5;
 
     /**
-     * An Octtree node.
+     * An Octree node.
      */
     static class OctTreeNode {
         int children;
@@ -73,7 +73,7 @@ public class OctTreeQuantizer implements Quantizer {
     private int reduceColors;
     private int maximumColors;
     private int colors = 0;
-    private List<Vector<OctTreeNode>> colorList;
+    private final List<Vector<OctTreeNode>> colorList;
 
     public OctTreeQuantizer() {
         setup(256);
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/Quantizer.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/Quantizer.java
index 2aa6233d6..c9122f6cc 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/Quantizer.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/Quantizer.java
@@ -26,7 +26,7 @@ public interface Quantizer {
      * Initialize the quantizer. This should be called before adding any pixels.
      * @param numColors the number of colors we're quantizing to.
      */
-    public void setup(int numColors);
+    void setup(int numColors);
 
     /**
      * Add pixels to the quantizer.
@@ -34,13 +34,13 @@ public interface Quantizer {
      * @param offset the offset into the array
      * @param count the count of pixels
      */
-    public void addPixels(int[] pixels, int offset, int count);
+    void addPixels(int[] pixels, int offset, int count);
 
     /**
      * Build a color table from the added pixels.
      * @return an array of ARGB pixels representing a color table
      */
-    public int[] buildColorTable();
+    int[] buildColorTable();
 
     /**
      * Using the previously-built color table, return the index into that table for a pixel.
@@ -49,5 +49,5 @@ public interface Quantizer {
      * @param rgb the pixel to find
      * @return the pixel's index in the color table
      */
-    public int getIndexForColor(int rgb);
+    int getIndexForColor(int rgb);
 }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/test/TestMediaManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/test/TestMediaManager.java
index dfcf47066..055c30f6c 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/test/TestMediaManager.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/test/TestMediaManager.java
@@ -36,7 +36,7 @@ public class TestMediaManager extends JingleMediaManager {
 
     public static final String MEDIA_NAME = "TestMedia";
 
-    private List<PayloadType> payloads = new ArrayList<PayloadType>();
+    private List<PayloadType> payloads = new ArrayList<>();
 
     private PayloadType preferredPayloadType = null;
 
@@ -69,7 +69,7 @@ public class TestMediaManager extends JingleMediaManager {
     @Override
     public JingleMediaSession createMediaSession(PayloadType payloadType, final TransportCandidate remote,
             final TransportCandidate local, final JingleSession jingleSession) {
-        TestMediaSession session = null;
+        TestMediaSession session;
 
         session = new TestMediaSession(payloadType, remote, local, "", jingleSession);
 
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/test/TestMediaSession.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/test/TestMediaSession.java
index 5f12b71b4..afecb9b58 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/test/TestMediaSession.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/test/TestMediaSession.java
@@ -54,18 +54,18 @@ public class TestMediaSession extends JingleMediaSession {
      * Starts transmission and for NAT Traversal reasons start receiving also.
      */
     @Override
-    public void startTrasmit() {
+    public void startTransmit() {
 
     }
 
     /**
-     * Set transmit activity. If the active is true, the instance should trasmit.
+     * Set transmit activity. If the active is true, the instance should transmit.
      * If it is set to false, the instance should pause transmit.
      *
      * @param active active state
      */
     @Override
-    public void setTrasmit(boolean active) {
+    public void setTransmit(boolean active) {
 
     }
 
@@ -81,7 +81,7 @@ public class TestMediaSession extends JingleMediaSession {
      * Stops transmission and for NAT Traversal reasons stop receiving also.
      */
     @Override
-    public void stopTrasmit() {
+    public void stopTransmit() {
 
     }
 
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedResolver.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedResolver.java
index df6ff4d99..451da4ad1 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedResolver.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedResolver.java
@@ -44,11 +44,11 @@ import org.jivesoftware.smackx.jingleold.JingleSession;
 public class BridgedResolver extends TransportResolver {
     private static final Logger LOGGER = Logger.getLogger(BridgedResolver.class.getName());
 
-    XMPPConnection connection;
+    private final XMPPConnection connection;
 
-    Random random = new Random();
+    private final Random random = new Random();
 
-    long sid;
+    private long sid;
 
     /**
      * Constructor.
@@ -59,10 +59,10 @@ public class BridgedResolver extends TransportResolver {
         this.connection = connection;
     }
 
-    /**
+    /**1
      * Resolve Bridged Candidate.
      * <p/>
-     * The BridgedResolver takes the IP addresse and ports of a jmf proxy service.
+     * The BridgedResolver takes the IP address and ports of a jmf proxy service.
      * @throws NotConnectedException 
      * @throws InterruptedException 
      */
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/DatagramListener.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/DatagramListener.java
index e671b1651..135000bc1 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/DatagramListener.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/DatagramListener.java
@@ -32,6 +32,6 @@ public interface DatagramListener {
      * @param datagramPacket the datagram stanza(/packet) received.
      * @return ?
      */
-    public boolean datagramReceived(DatagramPacket datagramPacket);
+    boolean datagramReceived(DatagramPacket datagramPacket);
 
 }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICECandidate.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICECandidate.java
index a1d3da9c9..6650ce0e8 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICECandidate.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICECandidate.java
@@ -233,7 +233,7 @@ public class ICECandidate extends TransportCandidate implements Comparable<ICECa
                 final TestResult result = new TestResult();
 
                 // Media Proxy don't have Echo features.
-                // If its a relayed candidate we assumpt that is NOT Valid while other candidates still being checked.
+                // If its a relayed candidate we assumed that is NOT Valid while other candidates still being checked.
                 // The negotiator MUST add then in the correct situations
                 if (getType().equals(Type.relay)) {
                     triggerCandidateChecked(false);
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICEResolver.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICEResolver.java
index 88054ef93..d6f2b194b 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICEResolver.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICEResolver.java
@@ -53,7 +53,7 @@ public class ICEResolver extends TransportResolver {
     long sid;
     String server;
     int port;
-    static Map<String, ICENegociator> negociatorsMap = new HashMap<String, ICENegociator>();
+    static Map<String, ICENegociator> negociatorsMap = new HashMap<>();
     // ICENegociator iceNegociator = null;
 
     public ICEResolver(XMPPConnection connection, String server, int port) {
@@ -80,7 +80,7 @@ public class ICEResolver extends TransportResolver {
 
                 // gather candidates
                 iceNegociator.gatherCandidateAddresses();
-                // priorize candidates
+                // prioritize candidates
                 iceNegociator.prioritizeCandidates();
             // CHECKSTYLE:ON
             }
@@ -117,7 +117,7 @@ public class ICEResolver extends TransportResolver {
         for (Candidate candidate : iceNegociator.getSortedCandidates())
             try {
                 Candidate.CandidateType type = candidate.getCandidateType();
-                ICECandidate.Type iceType = ICECandidate.Type.local;
+                ICECandidate.Type iceType;
                 if (type.equals(Candidate.CandidateType.ServerReflexive))
                     iceType = ICECandidate.Type.srflx;
                 else if (type.equals(Candidate.CandidateType.PeerReflexive))
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/JingleTransportManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/JingleTransportManager.java
index b6945bf3a..e23776a92 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/JingleTransportManager.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/JingleTransportManager.java
@@ -42,7 +42,7 @@ public abstract class JingleTransportManager {
     // This class implements the context of a Strategy pattern...
 
     /**
-     * Deafult contructor.
+     * Default constructor.
      */
     public JingleTransportManager() {
 
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java
index 4296df0d3..33c8efd41 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java
@@ -213,7 +213,7 @@ public class RTPBridge extends IQ {
     /**
      * Get Side A receive port.
      *
-     * @return the side A receive prot
+     * @return the side A receive port
      */
     public int getPortA() {
         return portA;
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ResultListener.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ResultListener.java
index 23adcf92d..1201ac836 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ResultListener.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ResultListener.java
@@ -24,6 +24,6 @@ package org.jivesoftware.smackx.jingleold.nat;
  */
 public interface ResultListener {
 
-    public void testFinished(TestResult result, TransportCandidate candidate);
+    void testFinished(TestResult result, TransportCandidate candidate);
 
 }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUN.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUN.java
index f0d7854d8..c934fb5e0 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUN.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUN.java
@@ -50,7 +50,7 @@ public class STUN extends SimpleIQ {
 
     private static final Logger LOGGER = Logger.getLogger(STUN.class.getName());
 
-    private List<StunServerAddress> servers = new ArrayList<StunServerAddress>();
+    private final List<StunServerAddress> servers = new ArrayList<>();
 
     private String publicIp = null;
 
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUNResolver.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUNResolver.java
index aa5b8e9a3..69abdb4bb 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUNResolver.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUNResolver.java
@@ -136,7 +136,7 @@ public class STUNResolver extends TransportResolver {
      * @return A list of loaded servers
      */
     public ArrayList<STUNService> loadSTUNServers(java.io.InputStream stunConfigStream) {
-        ArrayList<STUNService> serversList = new ArrayList<STUNService>();
+        ArrayList<STUNService> serversList = new ArrayList<>();
         String serverName;
         int serverPort;
 
@@ -218,7 +218,7 @@ public class STUNResolver extends TransportResolver {
      * @return a list of services
      */
     public ArrayList<STUNService> loadSTUNServers() {
-        ArrayList<STUNService> serversList = new ArrayList<STUNService>();
+        ArrayList<STUNService> serversList = new ArrayList<>();
 
         // Load the STUN configuration
         try {
@@ -234,7 +234,7 @@ public class STUNResolver extends TransportResolver {
 
                 while (stunConfigEnum.hasMoreElements() && serversList.isEmpty()) {
                     URL url = stunConfigEnum.nextElement();
-                    java.io.InputStream stunConfigStream = null;
+                    java.io.InputStream stunConfigStream;
 
                     stunConfigStream = url.openStream();
                     serversList.addAll(loadSTUNServers(stunConfigStream));
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportCandidate.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportCandidate.java
index 9665d2100..de55a860a 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportCandidate.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportCandidate.java
@@ -31,9 +31,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.jivesoftware.smack.XMPPConnection;
-
 import org.jivesoftware.smackx.jingleold.JingleSession;
-import org.jivesoftware.smackx.jingleold.nat.TransportResolverListener.Checker;
 
 import org.jxmpp.jid.Jid;
 
@@ -74,7 +72,7 @@ public abstract class TransportCandidate {
     private Thread echoThread = null;
 
     // Listeners for events
-    private final List<TransportResolverListener.Checker> listeners = new ArrayList<Checker>();
+    private final List<TransportResolverListener.Checker> listeners = new ArrayList<>();
 
     public void addCandidateEcho(JingleSession session) throws SocketException, UnknownHostException {
         candidateEcho = new CandidateEcho(this, session);
@@ -134,12 +132,12 @@ public abstract class TransportCandidate {
     }
 
     /**
-     * Set the symetric candidate for this candidate.
+     * Set the symmetric candidate for this candidate.
      *
-     * @param symetric
+     * @param symmetric
      */
-    public void setSymmetric(TransportCandidate symetric) {
-        this.symmetric = symetric;
+    public void setSymmetric(TransportCandidate symmetric) {
+        this.symmetric = symmetric;
     }
 
     /**
@@ -400,7 +398,7 @@ public abstract class TransportCandidate {
      */
     public List<TransportResolverListener.Checker> getListenersList() {
         synchronized (listeners) {
-            return new ArrayList<Checker>(listeners);
+            return new ArrayList<>(listeners);
         }
     }
 
@@ -633,8 +631,8 @@ public abstract class TransportCandidate {
         byte[] send = null;
         byte[] receive = null;
         DatagramPacket sendStanza = null;
-        List<DatagramListener> listeners = new ArrayList<DatagramListener>();
-        List<ResultListener> resultListeners = new ArrayList<ResultListener>();
+        List<DatagramListener> listeners = new ArrayList<>();
+        List<ResultListener> resultListeners = new ArrayList<>();
         boolean enabled = true;
         boolean ended = false;
         long replyTries = 2;
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportNegotiator.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportNegotiator.java
index f864b2ce5..783ef5501 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportNegotiator.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportNegotiator.java
@@ -60,23 +60,23 @@ public abstract class TransportNegotiator extends JingleNegotiator {
     // transport (in milliseconds)
     public final static int CANDIDATES_ACCEPT_PERIOD = 4000;
 
-    // The session this nenotiator belongs to
+    // The session this negotiator belongs to
     // private final JingleSession session;
 
     // The transport manager
     private final TransportResolver resolver;
 
     // Transport candidates we have offered
-    private final List<TransportCandidate> offeredCandidates = new ArrayList<TransportCandidate>();
+    private final List<TransportCandidate> offeredCandidates = new ArrayList<>();
 
     // List of remote transport candidates
-    private final List<TransportCandidate> remoteCandidates = new ArrayList<TransportCandidate>();
+    private final List<TransportCandidate> remoteCandidates = new ArrayList<>();
 
     // Valid remote candidates
-    private final List<TransportCandidate> validRemoteCandidates = new ArrayList<TransportCandidate>();
+    private final List<TransportCandidate> validRemoteCandidates = new ArrayList<>();
 
     // Accepted Remote Candidates
-    private final List<TransportCandidate> acceptedRemoteCandidates = new ArrayList<TransportCandidate>();
+    private final List<TransportCandidate> acceptedRemoteCandidates = new ArrayList<>();
 
     // The best local candidate we have offered (and accepted by the other part)
     private TransportCandidate acceptedLocalCandidate;
@@ -87,7 +87,7 @@ public abstract class TransportNegotiator extends JingleNegotiator {
     // Listener for the resolver
     private TransportResolverListener.Resolver resolverListener;
 
-    private ContentNegotiator parentNegotiator;
+    private final ContentNegotiator parentNegotiator;
 
     /**
     * Default constructor.
@@ -359,7 +359,7 @@ public abstract class TransportNegotiator extends JingleNegotiator {
                             if (candidate instanceof ICECandidate) {
                                 ICECandidate iceCandidate = (ICECandidate) candidate;
                                 if (iceCandidate.getType().equals(Type.relay)) {
-                                    // TODO Check if the relay is reacheable.
+                                    // TODO Check if the relay is reachable.
                                     addValidRemoteCandidate(iceCandidate);
                                     foundRemoteRelay = true;
                                 }
@@ -473,7 +473,7 @@ public abstract class TransportNegotiator extends JingleNegotiator {
      */
     final ArrayList<TransportCandidate> getValidRemoteCandidatesList() {
         synchronized (validRemoteCandidates) {
-            return new ArrayList<TransportCandidate>(validRemoteCandidates);
+            return new ArrayList<>(validRemoteCandidates);
         }
     }
 
@@ -509,7 +509,7 @@ public abstract class TransportNegotiator extends JingleNegotiator {
      * @param jin The input jingle packet
      */
     private List<TransportCandidate> obtainCandidatesList(Jingle jingle) {
-        List<TransportCandidate> result = new ArrayList<TransportCandidate>();
+        List<TransportCandidate> result = new ArrayList<>();
 
         if (jingle != null) {
             // Get the list of candidates from the packet
@@ -598,7 +598,7 @@ public abstract class TransportNegotiator extends JingleNegotiator {
 
     /**
      * Dispatch an incoming packet. The method is responsible for recognizing
-     * the stanza(/packet) type and, depending on the current state, deliverying the
+     * the stanza(/packet) type and, depending on the current state, delivering the
      * stanza(/packet) to the right event handler and wait for a response.
      *
      * @param iq the stanza(/packet) received
@@ -609,7 +609,7 @@ public abstract class TransportNegotiator extends JingleNegotiator {
      */
     @Override
     public final List<IQ> dispatchIncomingPacket(IQ iq, String id) throws XMPPException, SmackException, InterruptedException {
-        List<IQ> responses = new ArrayList<IQ>();
+        List<IQ> responses = new ArrayList<>();
         IQ response = null;
 
         if (iq != null) {
@@ -690,7 +690,6 @@ public abstract class TransportNegotiator extends JingleNegotiator {
 
     /**
      *  @param jingle
-     *  @param jingleTransport
      *  @return the iq
      * @throws SmackException 
      * @throws InterruptedException 
@@ -704,7 +703,7 @@ public abstract class TransportNegotiator extends JingleNegotiator {
         // Start offering candidates
         sendTransportCandidatesOffer();
 
-        // All these candidates will be checked asyncronously. Wait for some
+        // All these candidates will be checked asynchronously. Wait for some
         // time and check if we have a valid candidate to use...
         delayedCheckBestCandidate(session, jingle);
 
@@ -716,7 +715,6 @@ public abstract class TransportNegotiator extends JingleNegotiator {
 
     /**
      *  @param jingle
-     *  @param jingleTransport
      *  @return the iq
      */
     private IQ receiveTransportInfoAction(Jingle jingle) {
@@ -728,7 +726,7 @@ public abstract class TransportNegotiator extends JingleNegotiator {
         //        // Start offering candidates
         //        sendTransportCandidatesOffer();
         //
-        //        // All these candidates will be checked asyncronously. Wait for some
+        //        // All these candidates will be checked asynchronously. Wait for some
         //        // time and check if we have a valid candidate to use...
         //        delayedCheckBestCandidate(session, jingle);
         //
@@ -750,7 +748,6 @@ public abstract class TransportNegotiator extends JingleNegotiator {
     /**
      * One of our transport candidates has been accepted.
      *
-     * @param jin The input packet
      * @return a Jingle packet
      * @throws XMPPException an exception
      * @see org.jivesoftware.smackx.jingleold.JingleNegotiator.State#eventAccept(org.jivesoftware.smackx.jingleold.packet.Jingle)
@@ -763,7 +760,7 @@ public abstract class TransportNegotiator extends JingleNegotiator {
         if (!accepted.isEmpty()) {
 
             for (TransportCandidate cand : accepted) {
-                LOGGER.fine("Remote acccepted candidate addr: " + cand.getIp());
+                LOGGER.fine("Remote accepted candidate addr: " + cand.getIp());
             }
 
             TransportCandidate cand = accepted.get(0);
@@ -784,7 +781,7 @@ public abstract class TransportNegotiator extends JingleNegotiator {
     private static IQ receiveSessionAcceptAction(Jingle jingle) {
         IQ response = null;
 
-        LOGGER.fine("Transport stabilished");
+        LOGGER.fine("Transport established");
         // triggerTransportEstablished(getAcceptedLocalCandidate(), getBestRemoteCandidate());
 
         // setNegotiatorState(JingleNegotiatorState.SUCCEEDED);
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportResolver.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportResolver.java
index 37a07a502..d01b41718 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportResolver.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportResolver.java
@@ -62,7 +62,7 @@ public abstract class TransportResolver {
     public static final int CHECK_TIMEOUT = 3000;
 
     // Listeners for events
-    private final ArrayList<TransportResolverListener> listeners = new ArrayList<TransportResolverListener>();
+    private final ArrayList<TransportResolverListener> listeners = new ArrayList<>();
 
     // TRue if the resolver is working
     private boolean resolving;
@@ -76,7 +76,7 @@ public abstract class TransportResolver {
     // We store a list of candidates internally, just in case there are several
     // possibilities. When the user asks for a transport, we return the best
     // one.
-    protected final List<TransportCandidate> candidates = new ArrayList<TransportCandidate>();
+    protected final List<TransportCandidate> candidates = new ArrayList<>();
 
     /**
      * Default constructor.
@@ -142,7 +142,7 @@ public abstract class TransportResolver {
     }
 
     /**
-     * Chack if the Transport Resolver is initialized.
+     * Check if the Transport Resolver is initialized.
      *
      * @return true if initialized
      */
@@ -151,8 +151,8 @@ public abstract class TransportResolver {
     }
 
     /**
-     * Indicate the beggining of the resolution process. This method must be
-     * used by subclasses at the begining of their resolve() method.
+     * Indicate the beginning of the resolution process. This method must be
+     * used by subclasses at the beginning of their resolve() method.
      */
     protected synchronized void setResolveInit() {
         resolved = false;
@@ -163,7 +163,7 @@ public abstract class TransportResolver {
 
     /**
      * Indicate the end of the resolution process. This method must be used by
-     * subclasses at the begining of their resolve() method.
+     * subclasses at the beginning of their resolve() method.
      */
     protected synchronized void setResolveEnd() {
         resolved = true;
@@ -203,7 +203,7 @@ public abstract class TransportResolver {
      */
     public ArrayList<TransportResolverListener> getListenersList() {
         synchronized (listeners) {
-            return new ArrayList<TransportResolverListener>(listeners);
+            return new ArrayList<>(listeners);
         }
     }
 
@@ -241,7 +241,7 @@ public abstract class TransportResolver {
     }
 
     /**
-     * Trigger a event notifying the obtention of all the candidates.
+     * Trigger a event notifying the obtainment of all the candidates.
      */
     private void triggerResolveEnd() {
         Iterator<TransportResolverListener> iter = getListenersList().iterator();
@@ -289,19 +289,19 @@ public abstract class TransportResolver {
      */
     public Iterator<TransportCandidate> getCandidates() {
         synchronized (candidates) {
-            return Collections.unmodifiableList(new ArrayList<TransportCandidate>(candidates)).iterator();
+            return Collections.unmodifiableList(new ArrayList<>(candidates)).iterator();
         }
     }
 
     /**
-     * Get the candididate with the highest preference.
+     * Get the candidate with the highest preference.
      *
      * @return The best candidate, according to the preference order.
      */
     public TransportCandidate getPreferredCandidate() {
         TransportCandidate result = null;
 
-        ArrayList<ICECandidate> cands = new ArrayList<ICECandidate>();
+        ArrayList<ICECandidate> cands = new ArrayList<>();
         for (TransportCandidate tpcan : getCandidatesList()) {
             if (tpcan instanceof ICECandidate)
                 cands.add((ICECandidate) tpcan);
@@ -319,7 +319,7 @@ public abstract class TransportResolver {
     }
 
     /**
-     * Get the numer of transport candidates.
+     * Get the number of transport candidates.
      *
      * @return The length of the transport candidates list.
      */
@@ -335,10 +335,10 @@ public abstract class TransportResolver {
      * @return the list of transport candidates
      */
     public List<TransportCandidate> getCandidatesList() {
-        List<TransportCandidate> result = null;
+        List<TransportCandidate> result;
 
         synchronized (candidates) {
-            result = new ArrayList<TransportCandidate>(candidates);
+            result = new ArrayList<>(candidates);
         }
 
         return result;
@@ -359,7 +359,7 @@ public abstract class TransportResolver {
     }
 
     /**
-     * Initialize Transport Resolver and wait until it is complete unitialized.
+     * Initialize Transport Resolver and wait until it is completely uninitialized.
      * @throws SmackException 
      * @throws InterruptedException 
      */
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportResolverListener.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportResolverListener.java
index c57801781..c169ac25a 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportResolverListener.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportResolverListener.java
@@ -21,15 +21,15 @@ import org.jivesoftware.smack.SmackException.NotConnectedException;
 /**
  * Transport resolver Interface .
  */
-public abstract interface TransportResolverListener {
+public interface TransportResolverListener {
     /**
      * Resolver listener.
      */
-    public interface Resolver extends TransportResolverListener {
+    interface Resolver extends TransportResolverListener {
         /**
          * The resolution process has been started.
          */
-        public void init();
+        void init();
 
         /**
          * A transport candidate has been added.
@@ -38,31 +38,31 @@ public abstract interface TransportResolverListener {
          * @throws NotConnectedException 
          * @throws InterruptedException 
          */
-        public void candidateAdded(TransportCandidate cand) throws NotConnectedException, InterruptedException;
+        void candidateAdded(TransportCandidate cand) throws NotConnectedException, InterruptedException;
 
         /**
          * All the transport candidates have been obtained.
          */
-        public void end();
+        void end();
     }
 
     /**
      * Resolver checker.
      */
-    public interface Checker extends TransportResolverListener {
+    interface Checker extends TransportResolverListener {
         /**
          * A transport candidate has been checked.
          *
          * @param cand The transport candidate that has been checked.
          * @param result True if the candidate is usable.
          */
-        public void candidateChecked(TransportCandidate cand, boolean result);
+        void candidateChecked(TransportCandidate cand, boolean result);
 
         /**
          * A transport candidate is being checked.
          *
          * @param cand The transport candidate that is being checked.
          */
-        public void candidateChecking(TransportCandidate cand);
+        void candidateChecking(TransportCandidate cand);
     }
 }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/Jingle.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/Jingle.java
index c562a2d7b..092dd5b00 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/Jingle.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/Jingle.java
@@ -60,7 +60,7 @@ public class Jingle extends IQ {
 
     // Sub-elements of a Jingle object.
 
-    private final List<JingleContent> contents = new ArrayList<JingleContent>();
+    private final List<JingleContent> contents = new ArrayList<>();
 
     private JingleContentInfo contentInfo;
 
@@ -222,7 +222,7 @@ public class Jingle extends IQ {
      */
     public Iterator<JingleContent> getContents() {
         synchronized (contents) {
-            return Collections.unmodifiableList(new ArrayList<JingleContent>(contents)).iterator();
+            return Collections.unmodifiableList(new ArrayList<>(contents)).iterator();
         }
     }
 
@@ -233,7 +233,7 @@ public class Jingle extends IQ {
      */
     public List<JingleContent> getContentsList() {
         synchronized (contents) {
-            return new ArrayList<JingleContent>(contents);
+            return new ArrayList<>(contents);
         }
     }
 
@@ -305,7 +305,7 @@ public class Jingle extends IQ {
 
     /**
      * Get the responder. The responder is the full JID of the entity that has
-     * replied to the initiation (which may be different to the "to" addresss in
+     * replied to the initiation (which may be different to the "to" address in
      * the IQ).
      *
      * @return the responder
@@ -317,7 +317,7 @@ public class Jingle extends IQ {
     /**
      * Set the responder. The responder must be the full JID of the entity that
      * has replied to the initiation (which may be different to the "to"
-     * addresss in the IQ).
+     * address in the IQ).
      *
      * @param resp the responder to set
      */
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContent.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContent.java
index 875eae08e..f49958c44 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContent.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContent.java
@@ -38,7 +38,7 @@ public class JingleContent implements ExtensionElement {
     private String name;
 
     private JingleDescription description;
-    private final List<JingleTransport> transports = new ArrayList<JingleTransport>();
+    private final List<JingleTransport> transports = new ArrayList<>();
 
     /**
      * Creates a content description..
@@ -101,7 +101,7 @@ public class JingleContent implements ExtensionElement {
      * Adds a JingleTransport type to the packet.
      * 
      * @param transport
-     *            the JignleTransport to add.
+     *            the JingleTransport to add.
      */
     public void addJingleTransport(final JingleTransport transport) {
         synchronized (transports) {
@@ -139,7 +139,7 @@ public class JingleContent implements ExtensionElement {
      */
     public List<JingleTransport> getJingleTransportsList() {
         synchronized (transports) {
-            return new ArrayList<JingleTransport>(transports);
+            return new ArrayList<>(transports);
         }
     }
 
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentDescription.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentDescription.java
index da5d58214..6e5f163c2 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentDescription.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentDescription.java
@@ -38,7 +38,7 @@ public abstract class JingleContentDescription implements ExtensionElement {
 
     // non-static
 
-    private final List<JinglePayloadType> payloads = new ArrayList<JinglePayloadType>();
+    private final List<JinglePayloadType> payloads = new ArrayList<>();
 
     /**
      * Creates a content description..
@@ -107,7 +107,7 @@ public abstract class JingleContentDescription implements ExtensionElement {
      */
     public ArrayList<JinglePayloadType> getJinglePayloadTypesList() {
         synchronized (payloads) {
-            return new ArrayList<JinglePayloadType>(payloads);
+            return new ArrayList<>(payloads);
         }
     }
 
@@ -117,7 +117,7 @@ public abstract class JingleContentDescription implements ExtensionElement {
      * @return a list of PayloadType.Audio
      */
     public ArrayList<PayloadType.Audio> getAudioPayloadTypesList() {
-        ArrayList<PayloadType.Audio> result = new ArrayList<PayloadType.Audio>();
+        ArrayList<PayloadType.Audio> result = new ArrayList<>();
         Iterator<JinglePayloadType> jinglePtsIter = getJinglePayloadTypes();
 
         while (jinglePtsIter.hasNext()) {
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentInfo.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentInfo.java
index 17af5659f..9165c3805 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentInfo.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentInfo.java
@@ -76,7 +76,7 @@ public class JingleContentInfo implements ExtensionElement {
     }
 
     /**
-     * Get the publilc namespace.
+     * Get the public namespace.
      */
     @Override
     public String getNamespace() {
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleDescription.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleDescription.java
index 14b216998..7745aafc3 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleDescription.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleDescription.java
@@ -41,7 +41,7 @@ public abstract class JingleDescription implements ExtensionElement {
 
     // non-static
 
-    private final List<PayloadType> payloads = new ArrayList<PayloadType>();
+    private final List<PayloadType> payloads = new ArrayList<>();
 
     /**
      * Creates a content description..
@@ -114,7 +114,7 @@ public abstract class JingleDescription implements ExtensionElement {
      */
     public List<PayloadType> getPayloadTypesList() {
         synchronized (payloads) {
-            return new ArrayList<PayloadType>(payloads);
+            return new ArrayList<>(payloads);
         }
     }
 
@@ -124,7 +124,7 @@ public abstract class JingleDescription implements ExtensionElement {
      * @return a list of PayloadType.Audio
      */
     public List<PayloadType> getAudioPayloadTypesList() {
-        ArrayList<PayloadType> result = new ArrayList<PayloadType>();
+        ArrayList<PayloadType> result = new ArrayList<>();
         Iterator<PayloadType> jinglePtsIter = getPayloadTypes();
 
         while (jinglePtsIter.hasNext()) {
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleTransport.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleTransport.java
index 1aeb087a5..a523c5d6e 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleTransport.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleTransport.java
@@ -103,9 +103,9 @@ public class JingleTransport implements ExtensionElement {
      * @return The candidates list.
      */
     public List<JingleTransportCandidate> getCandidatesList() {
-        ArrayList<JingleTransportCandidate> res = null;
+        ArrayList<JingleTransportCandidate> res;
         synchronized (candidates) {
-            res = new ArrayList<JingleTransportCandidate>(candidates);
+            res = new ArrayList<>(candidates);
         }
         return res;
     }
@@ -246,7 +246,7 @@ public class JingleTransport implements ExtensionElement {
         }
 
         /**
-         * Obtain a valid XML representation of a trancport candidate.
+         * Obtain a valid XML representation of a transport candidate.
          *
          * @return A string containing the XML dump of the transport candidate.
          */
@@ -295,7 +295,7 @@ public class JingleTransport implements ExtensionElement {
          */
         @Override
         public List<JingleTransportCandidate> getCandidatesList() {
-            List<JingleTransportCandidate> copy = new ArrayList<JingleTransportCandidate>();
+            List<JingleTransportCandidate> copy = new ArrayList<>();
             List<JingleTransportCandidate> superCandidatesList = super.getCandidatesList();
             for (int i = 0; i < superCandidatesList.size(); i++) {
                 copy.add(superCandidatesList.get(i));
@@ -381,7 +381,7 @@ public class JingleTransport implements ExtensionElement {
          */
         @Override
         public List<JingleTransportCandidate> getCandidatesList() {
-            List<JingleTransportCandidate> copy = new ArrayList<JingleTransportCandidate>();
+            List<JingleTransportCandidate> copy = new ArrayList<>();
             List<JingleTransportCandidate> superCandidatesList = super.getCandidatesList();
             if (superCandidatesList.size() > 0) {
                 copy.add(superCandidatesList.get(0));
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleProvider.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleProvider.java
index a1b31e719..9adc4088e 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleProvider.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleProvider.java
@@ -50,8 +50,7 @@ public class JingleProvider extends IQProvider<Jingle> {
         Jingle jingle = new Jingle();
         String sid = "";
         JingleActionEnum action;
-        Jid initiator = null;
-        Jid responder = null;
+        Jid initiator, responder;
         boolean done = false;
         JingleContent currentContent = null;
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/MetaData.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/MetaData.java
index 0bb13b306..df11ed420 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/MetaData.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/MetaData.java
@@ -39,7 +39,7 @@ public class MetaData implements ExtensionElement {
      */
     public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
 
-    private Map<String, List<String>> metaData;
+    private final Map<String, List<String>> metaData;
 
     public MetaData(Map<String, List<String>> metaData) {
         this.metaData = metaData;
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/QueueUser.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/QueueUser.java
index 6935247d1..2810de114 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/QueueUser.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/QueueUser.java
@@ -28,11 +28,11 @@ import java.util.Date;
  */
 public class QueueUser {
 
-    private String userID;
+    private final String userID;
 
-    private int queuePosition;
-    private int estimatedTime;
-    private Date joinDate;
+    private final int queuePosition;
+    private final int estimatedTime;
+    private final Date joinDate;
 
     /**
      * Queue user.
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/WorkgroupInvitationListener.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/WorkgroupInvitationListener.java
index 687694cb2..cefd6b2d5 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/WorkgroupInvitationListener.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/WorkgroupInvitationListener.java
@@ -32,6 +32,6 @@ public interface WorkgroupInvitationListener {
      * @param invitation an Invitation instance embodying the information pertaining to the
      *                      invitation
      */
-    public void invitationReceived(WorkgroupInvitation invitation);
+    void invitationReceived(WorkgroupInvitation invitation);
 
 }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Agent.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Agent.java
index c2d82963c..bc0e1ee10 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Agent.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Agent.java
@@ -42,7 +42,7 @@ public class Agent {
     public static Collection<String> getWorkgroups(Jid serviceJID, Jid agentJID, XMPPConnection connection) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
         AgentWorkgroups request = new AgentWorkgroups(agentJID);
         request.setTo(serviceJID);
-        AgentWorkgroups response = (AgentWorkgroups) connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
+        AgentWorkgroups response = connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
         return response.getWorkgroups();
     }
 
@@ -77,7 +77,7 @@ public class Agent {
         agentInfo.setType(IQ.Type.get);
         agentInfo.setTo(workgroupJID);
         agentInfo.setFrom(getUser());
-        AgentInfo response = (AgentInfo) connection.createStanzaCollectorAndSend(agentInfo).nextResultOrThrow();
+        AgentInfo response = connection.createStanzaCollectorAndSend(agentInfo).nextResultOrThrow();
         return response.getName();
     }
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java
index ba9d56516..3824bdf44 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java
@@ -56,9 +56,9 @@ public class AgentRoster {
     private static final int EVENT_AGENT_REMOVED = 1;
     private static final int EVENT_PRESENCE_CHANGED = 2;
 
-    private XMPPConnection connection;
-    private Jid workgroupJID;
-    private final List<String> entries = new ArrayList<String>();
+    private final XMPPConnection connection;
+    private final Jid workgroupJID;
+    private final List<String> entries = new ArrayList<>();
     private final List<AgentRosterListener> listeners = new ArrayList<>();
     private final Map<Jid, Map<Resourcepart, Presence>> presenceMap = new HashMap<>();
     // The roster is marked as initialized when at least a single roster packet
@@ -168,7 +168,7 @@ public class AgentRoster {
      * @return all entries in the roster.
      */
     public Set<String> getAgents() {
-        Set<String> agents = new HashSet<String>();
+        Set<String> agents = new HashSet<>();
         synchronized (entries) {
             for (Iterator<String> i = entries.iterator(); i.hasNext();) {
                 agents.add(i.next());
@@ -270,7 +270,7 @@ public class AgentRoster {
      * Fires event to listeners.
      */
     private void fireEvent(int eventType, Object eventObject) {
-        AgentRosterListener[] listeners = null;
+        AgentRosterListener[] listeners;
         synchronized (this.listeners) {
             listeners = new AgentRosterListener[this.listeners.size()];
             this.listeners.toArray(listeners);
@@ -310,7 +310,7 @@ public class AgentRoster {
             // for a particular user a map with the presence packets saved for each resource.
             if (presence.getType() == Presence.Type.available) {
                 // Ignore the presence packet unless it has an agent status extension.
-                AgentStatus agentStatus = (AgentStatus) presence.getExtension(
+                AgentStatus agentStatus = presence.getExtension(
                         AgentStatus.ELEMENT_NAME, AgentStatus.NAMESPACE);
                 if (agentStatus == null) {
                     return;
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRosterListener.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRosterListener.java
index ba589a01a..35747420f 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRosterListener.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRosterListener.java
@@ -25,9 +25,9 @@ import org.jivesoftware.smack.packet.Presence;
  */
 public interface AgentRosterListener {
 
-    public void agentAdded(String jid);
+    void agentAdded(String jid);
 
-    public void agentRemoved(String jid);
+    void agentRemoved(String jid);
 
-    public void presenceChanged(Presence presence);
+    void presenceChanged(Presence presence);
 }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java
index f0aaa47ad..217f8407e 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java
@@ -94,9 +94,9 @@ import org.jxmpp.stringprep.XmppStringprepException;
 public class AgentSession {
     private static final Logger LOGGER = Logger.getLogger(AgentSession.class.getName());
 
-    private XMPPConnection connection;
+    private final XMPPConnection connection;
 
-    private Jid workgroupJID;
+    private final Jid workgroupJID;
 
     private boolean online = false;
     private Presence.Mode presenceMode;
@@ -110,10 +110,10 @@ public class AgentSession {
     private final List<QueueUsersListener> queueUsersListeners;
 
     private AgentRoster agentRoster = null;
-    private TranscriptManager transcriptManager;
-    private TranscriptSearchManager transcriptSearchManager;
-    private Agent agent;
-    private StanzaListener packetListener;
+    private final TranscriptManager transcriptManager;
+    private final TranscriptSearchManager transcriptSearchManager;
+    private final Agent agent;
+    private final StanzaListener packetListener;
 
     /**
      * Constructs a new agent session instance. Note, the {@link #setOnline(boolean)}
@@ -137,11 +137,11 @@ public class AgentSession {
 
         this.maxChats = -1;
 
-        this.metaData = new HashMap<String, List<String>>();
+        this.metaData = new HashMap<>();
 
-        offerListeners = new ArrayList<OfferListener>();
-        invitationListeners = new ArrayList<WorkgroupInvitationListener>();
-        queueUsersListeners = new ArrayList<QueueUsersListener>();
+        offerListeners = new ArrayList<>();
+        invitationListeners = new ArrayList<>();
+        queueUsersListeners = new ArrayList<>();
 
         // Create a filter to listen for packets we're interested in.
         OrFilter filter = new OrFilter(
@@ -341,7 +341,7 @@ public class AgentSession {
             StanzaCollector collector = this.connection.createStanzaCollectorAndSend(new AndFilter(
                             new StanzaTypeFilter(Presence.class), FromMatchesFilter.create(workgroupJID)), presence);
 
-            presence = (Presence) collector.nextResultOrThrow();
+            presence = collector.nextResultOrThrow();
 
             // We can safely update this iv since we didn't get any error
             this.online = online;
@@ -773,7 +773,7 @@ public class AgentSession {
             }
 
             // QueueOverview packet extensions contain basic information about a queue.
-            QueueOverview queueOverview = (QueueOverview) presence.getExtension(QueueOverview.ELEMENT_NAME, QueueOverview.NAMESPACE);
+            QueueOverview queueOverview = presence.getExtension(QueueOverview.ELEMENT_NAME, QueueOverview.NAMESPACE);
             if (queueOverview != null) {
                 if (queueOverview.getStatus() == null) {
                     queue.setStatus(WorkgroupQueue.Status.CLOSED);
@@ -792,7 +792,7 @@ public class AgentSession {
 
             // QueueDetails packet extensions contain information about the users in
             // a queue.
-            QueueDetails queueDetails = (QueueDetails) packet.getExtension(QueueDetails.ELEMENT_NAME, QueueDetails.NAMESPACE);
+            QueueDetails queueDetails = packet.getExtension(QueueDetails.ELEMENT_NAME, QueueDetails.NAMESPACE);
             if (queueDetails != null) {
                 queue.setUsers(queueDetails.getUsers());
                 // Fire event.
@@ -816,20 +816,20 @@ public class AgentSession {
             Message message = (Message) packet;
 
             // Check if a room invitation was sent and if the sender is the workgroup
-            MUCUser mucUser = (MUCUser) message.getExtension("x",
+            MUCUser mucUser = message.getExtension("x",
                     "http://jabber.org/protocol/muc#user");
             MUCUser.Invite invite = mucUser != null ? mucUser.getInvite() : null;
             if (invite != null && workgroupJID.equals(invite.getFrom())) {
                 String sessionID = null;
                 Map<String, List<String>> metaData = null;
 
-                SessionID sessionIDExt = (SessionID) message.getExtension(SessionID.ELEMENT_NAME,
+                SessionID sessionIDExt = message.getExtension(SessionID.ELEMENT_NAME,
                         SessionID.NAMESPACE);
                 if (sessionIDExt != null) {
                     sessionID = sessionIDExt.getSessionID();
                 }
 
-                MetaData metaDataExt = (MetaData) message.getExtension(MetaData.ELEMENT_NAME,
+                MetaData metaDataExt = message.getExtension(MetaData.ELEMENT_NAME,
                         MetaData.NAMESPACE);
                 if (metaDataExt != null) {
                     metaData = metaDataExt.getMetaData();
@@ -876,7 +876,7 @@ public class AgentSession {
         request.setTo(workgroupJID);
         request.setSessionID(sessionID);
 
-        ChatNotes response = (ChatNotes) connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
+        ChatNotes response = connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
         return response;
     }
 
@@ -922,7 +922,7 @@ public class AgentSession {
         request.setType(IQ.Type.get);
         request.setTo(workgroupJID);
 
-        SearchSettings response = (SearchSettings) connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
+        SearchSettings response = connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
         return response;
     }
 
@@ -942,7 +942,7 @@ public class AgentSession {
         request.setTo(workgroupJID);
         request.setPersonal(!global);
 
-        Macros response = (Macros) connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
+        Macros response = connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
         return response.getRootGroup();
     }
 
@@ -990,7 +990,7 @@ public class AgentSession {
      * a user, an agent, a queue or a workgroup. In the case of a queue or a workgroup the workgroup service
      * will decide the best agent to receive the invitation.<p>
      *
-     * This method will return either when the service returned an ACK of the request or if an error occured
+     * This method will return either when the service returned an ACK of the request or if an error occurred
      * while requesting the invitation. After sending the ACK the service will send the invitation to the target
      * entity. When dealing with agents the common sequence of offer-response will be followed. However, when
      * sending an invitation to a user a standard MUC invitation will be sent.<p>
@@ -1000,7 +1000,7 @@ public class AgentSession {
      * accepted the offer but failed to join the room.
      *
      * Different situations may lead to a failed invitation. Possible cases are: 1) all agents rejected the
-     * offer and ther are no agents available, 2) the agent that accepted the offer failed to join the room or
+     * offer and there are no agents available, 2) the agent that accepted the offer failed to join the room or
      * 2) the user that received the MUC invitation never replied or joined the room. In any of these cases
      * (or other failing cases) the inviter will get an error message with the failed notification.
      *
@@ -1030,7 +1030,7 @@ public class AgentSession {
      * a user, an agent, a queue or a workgroup. In the case of a queue or a workgroup the workgroup service
      * will decide the best agent to receive the invitation.<p>
      *
-     * This method will return either when the service returned an ACK of the request or if an error occured
+     * This method will return either when the service returned an ACK of the request or if an error occurred
      * while requesting the transfer. After sending the ACK the service will send the invitation to the target
      * entity. When dealing with agents the common sequence of offer-response will be followed. However, when
      * sending an invitation to a user a standard MUC invitation will be sent.<p>
@@ -1079,7 +1079,7 @@ public class AgentSession {
         setting.setType(IQ.Type.get);
         setting.setTo(workgroupJID);
 
-        GenericSettings response = (GenericSettings) connection.createStanzaCollectorAndSend(
+        GenericSettings response = connection.createStanzaCollectorAndSend(
                         setting).nextResultOrThrow();
         return response;
     }
@@ -1089,7 +1089,7 @@ public class AgentSession {
         request.setType(IQ.Type.get);
         request.setTo(workgroupJID);
 
-        MonitorPacket response = (MonitorPacket) connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
+        MonitorPacket response = connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
         return response.isMonitor();
     }
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/InvitationRequest.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/InvitationRequest.java
index 6da5b6a63..8b189013f 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/InvitationRequest.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/InvitationRequest.java
@@ -24,9 +24,9 @@ package org.jivesoftware.smackx.workgroup.agent;
  */
 public class InvitationRequest extends OfferContent {
 
-    private String inviter;
-    private String room;
-    private String reason;
+    private final String inviter;
+    private final String room;
+    private final String reason;
 
     public InvitationRequest(String inviter, String room, String reason) {
         this.inviter = inviter;
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java
index 8feff9225..1e4524839 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java
@@ -38,16 +38,16 @@ import org.jxmpp.jid.Jid;
  */
 public class Offer {
 
-    private XMPPConnection connection;
-    private AgentSession session;
+    private final XMPPConnection connection;
+    private final AgentSession session;
 
-    private String sessionID;
-    private Jid userJID;
-    private Jid userID;
-    private Jid workgroupName;
-    private Date expiresDate;
-    private Map<String, List<String>> metaData;
-    private OfferContent content;
+    private final String sessionID;
+    private final Jid userJID;
+    private final Jid userID;
+    private final Jid workgroupName;
+    private final Date expiresDate;
+    private final Map<String, List<String>> metaData;
+    private final OfferContent content;
 
     private boolean accepted = false;
     private boolean rejected = false;
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferListener.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferListener.java
index 20c36dce3..93de6bf8f 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferListener.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferListener.java
@@ -34,7 +34,7 @@ public interface OfferListener {
      *
      * @param request the Offer instance embodying the details of the offer
      */
-    public void offerReceived (Offer request);
+    void offerReceived (Offer request);
 
     /**
      * The implementing class instance will be notified via this when the AgentSessino has received
@@ -42,6 +42,6 @@ public interface OfferListener {
      *
      * @param revokedOffer the RevokedOffer instance embodying the details of the revoked offer
      */
-    public void offerRevoked (RevokedOffer revokedOffer);
+    void offerRevoked (RevokedOffer revokedOffer);
 
 }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/QueueUsersListener.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/QueueUsersListener.java
index 2bac37e95..523637d4d 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/QueueUsersListener.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/QueueUsersListener.java
@@ -30,7 +30,7 @@ public interface QueueUsersListener {
      * @param queue the workgroup queue.
      * @param status the status of queue.
      */
-    public void statusUpdated(WorkgroupQueue queue, WorkgroupQueue.Status status);
+    void statusUpdated(WorkgroupQueue queue, WorkgroupQueue.Status status);
 
     /**
      * The average wait time of the queue was updated.
@@ -38,7 +38,7 @@ public interface QueueUsersListener {
      * @param queue the workgroup queue.
      * @param averageWaitTime the average wait time of the queue.
      */
-    public void averageWaitTimeUpdated(WorkgroupQueue queue, int averageWaitTime);
+    void averageWaitTimeUpdated(WorkgroupQueue queue, int averageWaitTime);
 
     /**
      * The date of oldest entry waiting in the queue was updated.
@@ -46,7 +46,7 @@ public interface QueueUsersListener {
      * @param queue the workgroup queue.
      * @param oldestEntry the date of the oldest entry waiting in the queue.
      */
-    public void oldestEntryUpdated(WorkgroupQueue queue, Date oldestEntry);
+    void oldestEntryUpdated(WorkgroupQueue queue, Date oldestEntry);
 
     /**
      * The list of users waiting in the queue was updated.
@@ -54,5 +54,5 @@ public interface QueueUsersListener {
      * @param queue the workgroup queue.
      * @param users the list of users waiting in the queue.
      */
-    public void usersUpdated(WorkgroupQueue queue, Set<QueueUser> users);
+    void usersUpdated(WorkgroupQueue queue, Set<QueueUser> users);
 }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/RevokedOffer.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/RevokedOffer.java
index 159d264cf..82fdcd1d4 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/RevokedOffer.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/RevokedOffer.java
@@ -29,12 +29,12 @@ import org.jxmpp.jid.Jid;
  */
 public class RevokedOffer {
 
-    private Jid userJID;
-    private Jid userID;
-    private Jid workgroupName;
-    private String sessionID;
-    private String reason;
-    private Date timestamp;
+    private final Jid userJID;
+    private final Jid userID;
+    private final Jid workgroupName;
+    private final String sessionID;
+    private final String reason;
+    private final Date timestamp;
 
     /**
      *
@@ -78,7 +78,7 @@ public class RevokedOffer {
     }
 
     /**
-     * Get the sesion id.
+     * Get the session id.
      * @return the session id which will associate all packets for the pending chat
      */
     public String getSessionID() {
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptManager.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptManager.java
index d5e36eb29..ac0aece8f 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptManager.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptManager.java
@@ -55,7 +55,7 @@ public class TranscriptManager {
     public Transcript getTranscript(Jid workgroupJID, String sessionID) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
         Transcript request = new Transcript(sessionID);
         request.setTo(workgroupJID);
-        Transcript response = (Transcript) connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
+        Transcript response = connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
         return response;
     }
 
@@ -74,7 +74,7 @@ public class TranscriptManager {
     public Transcripts getTranscripts(Jid workgroupJID, Jid userID) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
         Transcripts request = new Transcripts(userID);
         request.setTo(workgroupJID);
-        Transcripts response = (Transcripts) connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
+        Transcripts response = connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
         return response;
     }
 }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java
index da6e700fb..63a457e9b 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java
@@ -37,7 +37,7 @@ import org.jxmpp.jid.DomainBareJid;
  * @author Gaston Dombiak
  */
 public class TranscriptSearchManager {
-    private XMPPConnection connection;
+    private final XMPPConnection connection;
 
     public TranscriptSearchManager(XMPPConnection connection) {
         this.connection = connection;
@@ -60,7 +60,7 @@ public class TranscriptSearchManager {
         search.setType(IQ.Type.get);
         search.setTo(serviceJID);
 
-        TranscriptSearch response = (TranscriptSearch) connection.createStanzaCollectorAndSend(
+        TranscriptSearch response = connection.createStanzaCollectorAndSend(
                         search).nextResultOrThrow();
         return Form.getFormFrom(response);
     }
@@ -84,7 +84,7 @@ public class TranscriptSearchManager {
         search.setTo(serviceJID);
         search.addExtension(completedForm.getDataFormToSend());
 
-        TranscriptSearch response = (TranscriptSearch) connection.createStanzaCollectorAndSend(
+        TranscriptSearch response = connection.createStanzaCollectorAndSend(
                         search).nextResultOrThrow();
         return ReportedData.getReportedDataFrom(response);
     }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TransferRequest.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TransferRequest.java
index 15fda70f9..17a0669ef 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TransferRequest.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TransferRequest.java
@@ -24,9 +24,9 @@ package org.jivesoftware.smackx.workgroup.agent;
  */
 public class TransferRequest extends OfferContent {
 
-    private String inviter;
-    private String room;
-    private String reason;
+    private final String inviter;
+    private final String room;
+    private final String reason;
 
     public TransferRequest(String inviter, String room, String reason) {
         this.inviter = inviter;
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/UserRequest.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/UserRequest.java
index c7016a432..f30d42c77 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/UserRequest.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/UserRequest.java
@@ -24,7 +24,7 @@ package org.jivesoftware.smackx.workgroup.agent;
  */
 public class UserRequest extends OfferContent {
     // TODO Do we want to use a singleton? Should we store the userID here?
-    private static UserRequest instance = new UserRequest();
+    private static final UserRequest instance = new UserRequest();
 
     public static OfferContent getInstance() {
         return instance;
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java
index eeb3ea307..c677e4d07 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java
@@ -49,7 +49,7 @@ public class AgentChatHistory extends IQ {
     private int maxSessions;
     private long startDate;
 
-    private List<AgentChatSession> agentChatSessions = new ArrayList<AgentChatSession>();
+    private final List<AgentChatSession> agentChatSessions = new ArrayList<>();
 
     public AgentChatHistory(String agentJID, int maxSessions, Date startDate) {
         this();
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/MacroGroup.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/MacroGroup.java
index 43e4d9b81..601ebe739 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/MacroGroup.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/MacroGroup.java
@@ -35,8 +35,8 @@ public class MacroGroup {
     private String title;
 
     public MacroGroup() {
-        macros = new ArrayList<Macro>();
-        macroGroups = new ArrayList<MacroGroup>();
+        macros = new ArrayList<>();
+        macroGroups = new ArrayList<>();
     }
 
     public void addMacro(Macro macro) {
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java
index 7cac2c118..e5615dd6b 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java
@@ -56,7 +56,7 @@ public class AgentStatus implements ExtensionElement {
     public static final String NAMESPACE = "http://jabber.org/protocol/workgroup";
 
     private String workgroupJID;
-    private List<ChatInfo> currentChats = new ArrayList<ChatInfo>();
+    private final List<ChatInfo> currentChats = new ArrayList<>();
     private int maxChats = -1;
 
     AgentStatus() {
@@ -122,12 +122,12 @@ public class AgentStatus implements ExtensionElement {
      */
     public static class ChatInfo {
 
-        private String sessionID;
-        private String userID;
-        private Date date;
-        private String email;
-        private String username;
-        private String question;
+        private final String sessionID;
+        private final String userID;
+        private final Date date;
+        private final String email;
+        private final String username;
+        private final String question;
 
         public ChatInfo(String sessionID, String userID, Date date, String email, String username, String question) {
             this.sessionID = sessionID;
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java
index 5b159e910..2bac45a01 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java
@@ -90,9 +90,9 @@ public class AgentStatusRequest extends IQ {
 
     public static class Item {
 
-        private String jid;
-        private String type;
-        private String name;
+        private final String jid;
+        private final String type;
+        private final String name;
 
         public Item(String jid, String type, String name) {
             this.jid = jid;
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentWorkgroups.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentWorkgroups.java
index 46daa3ced..4bd4f2784 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentWorkgroups.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentWorkgroups.java
@@ -56,7 +56,7 @@ public class AgentWorkgroups extends IQ {
     public AgentWorkgroups(Jid agentJID) {
         this();
         this.agentJID = agentJID;
-        this.workgroups = new ArrayList<String>();
+        this.workgroups = new ArrayList<>();
     }
 
     /**
@@ -107,7 +107,7 @@ public class AgentWorkgroups extends IQ {
         @Override
         public AgentWorkgroups parse(XmlPullParser parser, int initialDepth) throws XmlPullParserException, IOException {
             final Jid agentJID = ParserUtils.getJidAttribute(parser);
-            List<String> workgroups = new ArrayList<String>();
+            List<String> workgroups = new ArrayList<>();
 
             boolean done = false;
             while (!done) {
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java
index 16609613d..e0b587b22 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java
@@ -57,13 +57,13 @@ public class OccupantsInfo extends IQ {
      */
     public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
 
-    private String roomID;
+    private final String roomID;
     private final Set<OccupantInfo> occupants;
 
     public OccupantsInfo(String roomID) {
         super(ELEMENT_NAME, NAMESPACE);
         this.roomID = roomID;
-        this.occupants = new HashSet<OccupantInfo>();
+        this.occupants = new HashSet<>();
     }
 
     public String getRoomID() {
@@ -104,9 +104,9 @@ public class OccupantsInfo extends IQ {
 
     public static class OccupantInfo {
 
-        private String jid;
-        private String nickname;
-        private Date joined;
+        private final String jid;
+        private final String nickname;
+        private final Date joined;
 
         public OccupantInfo(String jid, String nickname, Date joined) {
             this.jid = jid;
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRequestProvider.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRequestProvider.java
index bc9bcd0ca..7111db66d 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRequestProvider.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRequestProvider.java
@@ -54,7 +54,7 @@ public class OfferRequestProvider extends IQProvider<IQ> {
         int timeout = -1;
         OfferContent content = null;
         boolean done = false;
-        Map<String, List<String>> metaData = new HashMap<String, List<String>>();
+        Map<String, List<String>> metaData = new HashMap<>();
 
         if (eventType != XmlPullParser.START_TAG) {
             // throw exception
@@ -116,12 +116,12 @@ public class OfferRequestProvider extends IQProvider<IQ> {
         public static final String ELEMENT = "offer";
         public static final String NAMESPACE = "http://jabber.org/protocol/workgroup";
 
-        private int timeout;
-        private Jid userID;
-        private Jid userJID;
-        private Map<String, List<String>> metaData;
-        private String sessionID;
-        private OfferContent content;
+        private final int timeout;
+        private final Jid userID;
+        private final Jid userJID;
+        private final Map<String, List<String>> metaData;
+        private final String sessionID;
+        private final OfferContent content;
 
         public OfferRequestPacket(Jid userJID, Jid userID, int timeout, Map<String, List<String>> metaData,
                 String sessionID, OfferContent content)
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java
index 5e59dd790..1da2ae89d 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java
@@ -72,10 +72,10 @@ public class OfferRevokeProvider extends IQProvider<IQ> {
 
         public static final String ELEMENT = "offer-revoke";
         public static final String NAMESPACE = "http://jabber.org/protocol/workgroup";
-        private Jid userJID;
-        private Jid userID;
-        private String sessionID;
-        private String reason;
+        private final Jid userJID;
+        private final Jid userID;
+        private final String sessionID;
+        private final String reason;
 
         public OfferRevokePacket (Jid userJID, Jid userID, String cause, String sessionID) {
             super(ELEMENT, NAMESPACE);
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java
index b927722cf..c7d291e72 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java
@@ -54,7 +54,7 @@ public final class QueueDetails implements ExtensionElement {
 
     private static final String DATE_FORMAT = "yyyyMMdd'T'HH:mm:ss";
 
-    private SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT);
+    private final SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT);
     /**
      * The list of users in the queue.
      */
@@ -157,7 +157,7 @@ public final class QueueDetails implements ExtensionElement {
             {
                 eventType = parser.next();
                 while ((eventType == XmlPullParser.START_TAG) && "user".equals(parser.getName())) {
-                    String uid = null;
+                    String uid;
                     int position = -1;
                     int time = -1;
                     Date joinTime = null;
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java
index 583c14608..e2fdaca52 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java
@@ -44,7 +44,7 @@ public class QueueOverview implements ExtensionElement {
     public static String NAMESPACE = "http://jabber.org/protocol/workgroup";
 
     private static final String DATE_FORMAT = "yyyyMMdd'T'HH:mm:ss";
-    private SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT);
+    private final SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT);
 
     private int averageWaitTime;
     private Date oldestEntry;
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java
index bfd18118b..642908f0c 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java
@@ -42,8 +42,8 @@ public class QueueUpdate implements ExtensionElement {
      */
     public static final String NAMESPACE = "http://jabber.org/protocol/workgroup";
 
-    private int position;
-    private int remainingTime;
+    private final int position;
+    private final int remainingTime;
 
     public QueueUpdate(int position, int remainingTime) {
         this.position = position;
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java
index 81386db25..3cf62029d 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java
@@ -133,7 +133,7 @@ public class RoomInvitation implements ExtensionElement {
     /**
      * Type of entity being invited to a groupchat support session.
      */
-    public static enum Type {
+    public enum Type {
         /**
          * A user is being invited to a groupchat support session. The user could be another agent
          * or just a regular XMPP user.
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java
index 09dd91ca9..a2a926924 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java
@@ -37,7 +37,7 @@ public class SessionID implements ExtensionElement {
      */
     public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
 
-    private String sessionID;
+    private final String sessionID;
 
     public SessionID(String sessionID) {
         this.sessionID = sessionID;
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcript.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcript.java
index bf497cf60..0b1c7826e 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcript.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcript.java
@@ -19,22 +19,21 @@ package org.jivesoftware.smackx.workgroup.packet;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Stanza;
 
 /**
- * Represents the conversation transcript that occured in a group chat room between an Agent
+ * Represents the conversation transcript that occurred in a group chat room between an Agent
  * and a user that requested assistance. The transcript contains all the Messages that were sent
  * to the room as well as the sent presences. 
  *
  * @author Gaston Dombiak
  */
 public class Transcript extends IQ {
-    private String sessionID;
-    private List<Stanza> packets;
+    private final String sessionID;
+    private final List<Stanza> packets;
 
     /**
      * Creates a transcript request for the given sessionID.
@@ -83,8 +82,7 @@ public class Transcript extends IQ {
                 .append(sessionID)
                 .append("\">");
 
-        for (Iterator<Stanza> it = packets.iterator(); it.hasNext();) {
-            Stanza packet = it.next();
+        for (Stanza packet : packets) {
             buf.append(packet.toXML());
         }
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptProvider.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptProvider.java
index 55b0b3c59..0acff6859 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptProvider.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptProvider.java
@@ -36,7 +36,7 @@ public class TranscriptProvider extends IQProvider<Transcript> {
     @Override
     public Transcript parse(XmlPullParser parser, int initialDepth) throws Exception {
         String sessionID = parser.getAttributeValue("", "sessionID");
-        List<Stanza> packets = new ArrayList<Stanza>();
+        List<Stanza> packets = new ArrayList<>();
 
         boolean done = false;
         while (!done) {
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java
index 2ce7c2602..9fe4aa84e 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java
@@ -24,7 +24,7 @@ import org.jivesoftware.smack.util.PacketParserUtils;
 import org.xmlpull.v1.XmlPullParser;
 
 /**
- * IQ stanza(/packet) for retrieving the transcript search form, submiting the completed search form
+ * IQ stanza(/packet) for retrieving the transcript search form, submitting the completed search form
  * or retrieving the answer of a transcript search.
  *
  * @author Gaston Dombiak
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcripts.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcripts.java
index 1a60855d5..1c339c23a 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcripts.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcripts.java
@@ -42,8 +42,8 @@ public class Transcripts extends IQ {
         UTC_FORMAT.setTimeZone(TimeZone.getTimeZone("GMT+0"));
     }
 
-    private Jid userID;
-    private List<Transcripts.TranscriptSummary> summaries;
+    private final Jid userID;
+    private final List<Transcripts.TranscriptSummary> summaries;
 
 
     /**
@@ -71,7 +71,7 @@ public class Transcripts extends IQ {
     /**
      * Returns the id of the user that was involved in the conversations. The userID could be a
      * real JID if the connected user was not anonymous. Otherwise, the userID will be a String
-     * that was provided by the anonymous user as a way to idenitify the user across many user
+     * that was provided by the anonymous user as a way to identify the user across many user
      * sessions.
      *
      * @return the id of the user that was involved in the conversations.
@@ -111,10 +111,10 @@ public class Transcripts extends IQ {
      * sessionID to get the full conversation transcript.
      */
     public static class TranscriptSummary {
-        private String sessionID;
-        private Date joinTime;
-        private Date leftTime;
-        private List<AgentDetail> agentDetails;
+        private final String sessionID;
+        private final Date joinTime;
+        private final Date leftTime;
+        private final List<AgentDetail> agentDetails;
 
         public TranscriptSummary(String sessionID, Date joinTime, Date leftTime, List<AgentDetail> agentDetails) {
             this.sessionID = sessionID;
@@ -189,9 +189,9 @@ public class Transcripts extends IQ {
      * An AgentDetail contains information of an Agent that was involved in a conversation. 
      */
     public static class AgentDetail {
-        private String agentJID;
-        private Date joinTime;
-        private Date leftTime;
+        private final String agentJID;
+        private final Date joinTime;
+        private final Date leftTime;
 
         public AgentDetail(String agentJID, Date joinTime, Date leftTime) {
             this.agentJID = agentJID;
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java
index 98510ef1b..2e35272f3 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java
@@ -47,7 +47,7 @@ public class TranscriptsProvider extends IQProvider<Transcripts> {
     @Override
     public Transcripts parse(XmlPullParser parser, int initialDepth) throws XmlPullParserException, IOException {
         Jid userID = ParserUtils.getJidAttribute(parser, "userID");
-        List<Transcripts.TranscriptSummary> summaries = new ArrayList<Transcripts.TranscriptSummary>();
+        List<Transcripts.TranscriptSummary> summaries = new ArrayList<>();
 
         boolean done = false;
         while (!done) {
@@ -72,7 +72,7 @@ public class TranscriptsProvider extends IQProvider<Transcripts> {
         String sessionID =  parser.getAttributeValue("", "sessionID");
         Date joinTime = null;
         Date leftTime = null;
-        List<Transcripts.AgentDetail> agents = new ArrayList<Transcripts.AgentDetail>();
+        List<Transcripts.AgentDetail> agents = new ArrayList<>();
 
         boolean done = false;
         while (!done) {
@@ -103,7 +103,7 @@ public class TranscriptsProvider extends IQProvider<Transcripts> {
     }
 
     private List<Transcripts.AgentDetail> parseAgents(XmlPullParser parser) throws IOException, XmlPullParserException {
-        List<Transcripts.AgentDetail> agents = new ArrayList<Transcripts.AgentDetail>();
+        List<Transcripts.AgentDetail> agents = new ArrayList<>();
         String agentJID =  null;
         Date joinTime = null;
         Date leftTime = null;
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java
index 604b3c676..20469d2ee 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java
@@ -39,7 +39,7 @@ public class UserID implements ExtensionElement {
      */
     public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
 
-    private Jid userID;
+    private final Jid userID;
 
     public UserID(Jid userID) {
         this.userID = userID;
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java
index 47e517686..1cb631549 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java
@@ -41,7 +41,7 @@ public class WorkgroupInformation implements ExtensionElement {
      */
     public static final String NAMESPACE = "http://jabber.org/protocol/workgroup";
 
-    private String workgroupJID;
+    private final String workgroupJID;
 
     public WorkgroupInformation(String workgroupJID) {
         this.workgroupJID = workgroupJID;
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java
index 35420c32f..421dc0345 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java
@@ -46,7 +46,7 @@ public class ChatSettings extends IQ {
      */
     public static final int BOT_SETTINGS = 2;
 
-    private List<ChatSetting> settings;
+    private final List<ChatSetting> settings;
     private String key;
     private int type = -1;
 
@@ -62,7 +62,7 @@ public class ChatSettings extends IQ {
 
     public ChatSettings() {
         super(ELEMENT_NAME, NAMESPACE);
-        settings = new ArrayList<ChatSetting>();
+        settings = new ArrayList<>();
     }
 
     public ChatSettings(String key) {
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java
index 668a4bb09..c106c4879 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java
@@ -30,7 +30,7 @@ import org.xmlpull.v1.XmlPullParserException;
 
 public class GenericSettings extends IQ {
 
-    private Map<String, String> map = new HashMap<String, String>();
+    private Map<String, String> map = new HashMap<>();
 
     private String query;
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/QueueListener.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/QueueListener.java
index 3b3877609..9bb1e5239 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/QueueListener.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/QueueListener.java
@@ -28,19 +28,19 @@ public interface QueueListener {
     /**
      * The user joined the workgroup queue.
      */
-    public void joinedQueue();
+    void joinedQueue();
 
     /**
      * The user departed the workgroup queue.
      */
-    public void departedQueue();
+    void departedQueue();
 
     /**
      * The user's queue position has been updated to a new value.
      *
      * @param currentPosition the user's current position in the queue.
      */
-    public void queuePositionUpdated(int currentPosition);
+    void queuePositionUpdated(int currentPosition);
 
     /**
      * The user's estimated remaining wait time in the queue has been updated.
@@ -48,6 +48,6 @@ public interface QueueListener {
      * @param secondsRemaining the estimated number of seconds remaining until the
      *      the user is routed to the agent.
      */
-    public void queueWaitTimeUpdated(int secondsRemaining);
+    void queueWaitTimeUpdated(int secondsRemaining);
 
 }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
index 18936a286..c4af93326 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
@@ -77,11 +77,11 @@ import org.jxmpp.jid.Jid;
  */
 public class Workgroup {
 
-    private Jid workgroupJID;
-    private XMPPConnection connection;
+    private final Jid workgroupJID;
+    private final XMPPConnection connection;
     private boolean inQueue;
-    private CopyOnWriteArraySet<WorkgroupInvitationListener> invitationListeners;
-    private CopyOnWriteArraySet<QueueListener> queueListeners;
+    private final CopyOnWriteArraySet<WorkgroupInvitationListener> invitationListeners;
+    private final CopyOnWriteArraySet<QueueListener> queueListeners;
 
     private int queuePosition = -1;
     private int queueRemainingTime = -1;
@@ -194,7 +194,7 @@ public class Workgroup {
         StanzaCollector collector = connection.createStanzaCollectorAndSend(new AndFilter(fromFilter,
                 typeFilter), directedPresence);
 
-        Presence response = (Presence) collector.nextResultOrThrow();
+        Presence response = collector.nextResultOrThrow();
         return Presence.Type.available == response.getType();
     }
 
@@ -220,7 +220,7 @@ public class Workgroup {
      * returned.
      *
      * @return the estimated time remaining (in seconds) that the user has to
-     *         wait inthe workgroupu queue, or -1 if time information isn't available
+     *         wait in the workgroup queue, or -1 if time information isn't available
      *         or if the user isn't int the queue.
      */
     public int getQueueRemainingTime() {
@@ -256,8 +256,8 @@ public class Workgroup {
      * server will ignore a manually specified userID if the user's connection to the server
      * is not anonymous.
      *
-     * @throws XMPPException if an error occured joining the queue. An error may indicate
-     *                       that a connection failure occured or that the server explicitly rejected the
+     * @throws XMPPException if an error occurred joining the queue. An error may indicate
+     *                       that a connection failure occurred or that the server explicitly rejected the
      *                       request to join the queue.
      * @throws SmackException 
      * @throws InterruptedException 
@@ -295,8 +295,8 @@ public class Workgroup {
      * is not anonymous.
      *
      * @param answerForm the completed form the send for the join request.
-     * @throws XMPPException if an error occured joining the queue. An error may indicate
-     *                       that a connection failure occured or that the server explicitly rejected the
+     * @throws XMPPException if an error occurred joining the queue. An error may indicate
+     *                       that a connection failure occurred or that the server explicitly rejected the
      *                       request to join the queue.
      * @throws SmackException 
      * @throws InterruptedException 
@@ -331,11 +331,11 @@ public class Workgroup {
      * be used instead of the user's JID to track conversations. The server will ignore a
      * manually specified userID if the user's connection to the server is not anonymous.
      *
-     * @param answerForm the completed form associated with the join reqest.
+     * @param answerForm the completed form associated with the join request.
      * @param userID     String that represents the ID of the user when using anonymous sessions
      *                   or <tt>null</tt> if a userID should not be used.
-     * @throws XMPPErrorException if an error occured joining the queue. An error may indicate
-     *                       that a connection failure occured or that the server explicitly rejected the
+     * @throws XMPPErrorException if an error occurred joining the queue. An error may indicate
+     *                       that a connection failure occurred or that the server explicitly rejected the
      *                       request to join the queue.
      * @throws NoResponseException 
      * @throws NotConnectedException 
@@ -383,8 +383,8 @@ public class Workgroup {
      * @param metadata metadata to create a dataform from.
      * @param userID   String that represents the ID of the user when using anonymous sessions
      *                 or <tt>null</tt> if a userID should not be used.
-     * @throws XMPPException if an error occured joining the queue. An error may indicate
-     *                       that a connection failure occured or that the server explicitly rejected the
+     * @throws XMPPException if an error occurred joining the queue. An error may indicate
+     *                       that a connection failure occurred or that the server explicitly rejected the
      *                       request to join the queue.
      * @throws SmackException 
      * @throws InterruptedException 
@@ -418,7 +418,7 @@ public class Workgroup {
      * under certain circumstances -- for example, if they no longer wish to be routed
      * to an agent because they've been waiting too long.
      *
-     * @throws XMPPErrorException if an error occured trying to send the depart queue
+     * @throws XMPPErrorException if an error occurred trying to send the depart queue
      *                       request to the server.
      * @throws NoResponseException 
      * @throws NotConnectedException 
@@ -533,7 +533,7 @@ public class Workgroup {
 
             else {
                 // Check if a room invitation was sent and if the sender is the workgroup
-                MUCUser mucUser = (MUCUser) msg.getExtension("x", "http://jabber.org/protocol/muc#user");
+                MUCUser mucUser = msg.getExtension("x", "http://jabber.org/protocol/muc#user");
                 MUCUser.Invite invite = mucUser != null ? mucUser.getInvite() : null;
                 if (invite != null && workgroupJID.equals(invite.getFrom())) {
                     String sessionID = null;
@@ -566,8 +566,8 @@ public class Workgroup {
      */
     private class JoinQueuePacket extends IQ {
 
-        private Jid userID;
-        private DataForm form;
+        private final Jid userID;
+        private final DataForm form;
 
         public JoinQueuePacket(Jid workgroup, Form answerForm, Jid userID) {
             super("join-queue", "http://jabber.org/protocol/workgroup");
@@ -656,7 +656,7 @@ public class Workgroup {
         request.setType(IQ.Type.get);
         request.setTo(workgroupJID);
 
-        ChatSettings response = (ChatSettings) connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
+        ChatSettings response = connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
 
         return response;
     }
@@ -696,9 +696,7 @@ public class Workgroup {
         request.setType(IQ.Type.get);
         request.setTo(workgroupJID);
 
-        OfflineSettings response = (OfflineSettings) connection.createStanzaCollectorAndSend(
-                        request).nextResultOrThrow();
-        return response;
+        return connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
     }
 
     /**
@@ -715,8 +713,7 @@ public class Workgroup {
         request.setType(IQ.Type.get);
         request.setTo(workgroupJID);
 
-        SoundSettings response = (SoundSettings) connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
-        return response;
+        return connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
     }
 
     /**
@@ -733,9 +730,7 @@ public class Workgroup {
         request.setType(IQ.Type.get);
         request.setTo(workgroupJID);
 
-        WorkgroupProperties response = (WorkgroupProperties) connection.createStanzaCollectorAndSend(
-                        request).nextResultOrThrow();
-        return response;
+        return connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
     }
 
     /**
@@ -754,9 +749,8 @@ public class Workgroup {
         request.setType(IQ.Type.get);
         request.setTo(workgroupJID);
 
-        WorkgroupProperties response = (WorkgroupProperties) connection.createStanzaCollectorAndSend(
+        return connection.createStanzaCollectorAndSend(
                         request).nextResultOrThrow();
-        return response;
     }
 
 
@@ -776,7 +770,7 @@ public class Workgroup {
         workgroupForm.setType(IQ.Type.get);
         workgroupForm.setTo(workgroupJID);
 
-        WorkgroupForm response = (WorkgroupForm) connection.createStanzaCollectorAndSend(
+        WorkgroupForm response = connection.createStanzaCollectorAndSend(
                         workgroupForm).nextResultOrThrow();
         return Form.getFormFrom(response);
     }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/ListenerEventDispatcher.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/ListenerEventDispatcher.java
index 0c42e2a6e..218ee2573 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/ListenerEventDispatcher.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/ListenerEventDispatcher.java
@@ -45,7 +45,7 @@ public class ListenerEventDispatcher implements Runnable {
     public ListenerEventDispatcher () {
         super();
 
-        this.triplets = new ArrayList<TripletContainer>();
+        this.triplets = new ArrayList<>();
 
         this.hasFinishedDispatching = false;
         this.isRunning = false;
@@ -86,7 +86,7 @@ public class ListenerEventDispatcher implements Runnable {
 
     @Override
     public void run() {
-        ListIterator<TripletContainer> li = null;
+        ListIterator<TripletContainer> li;
 
         this.isRunning = true;
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java
index fedadb5d3..fc52e1856 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java
@@ -20,12 +20,10 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
 import org.jivesoftware.smack.util.StringUtils;
-
 import org.jivesoftware.smackx.workgroup.MetaData;
 
 import org.xmlpull.v1.XmlPullParser;
@@ -54,7 +52,7 @@ public class MetaDataUtils {
         if ((eventType == XmlPullParser.START_TAG)
                 && parser.getName().equals(MetaData.ELEMENT_NAME)
                 && parser.getNamespace().equals(MetaData.NAMESPACE)) {
-            Map<String, List<String>> metaData = new Hashtable<String, List<String>>();
+            Map<String, List<String>> metaData = new Hashtable<>();
 
             eventType = parser.nextTag();
 
@@ -69,7 +67,7 @@ public class MetaDataUtils {
                     values.add(value);
                 }
                 else {
-                    List<String> values = new ArrayList<String>();
+                    List<String> values = new ArrayList<>();
                     values.add(value);
                     metaData.put(name, values);
                 }
@@ -93,11 +91,9 @@ public class MetaDataUtils {
         StringBuilder buf = new StringBuilder();
         if (metaData != null && metaData.size() > 0) {
             buf.append("<metadata xmlns=\"http://jivesoftware.com/protocol/workgroup\">");
-            for (Iterator<String> i = metaData.keySet().iterator(); i.hasNext();) {
-                String key = i.next();
+            for (String key : metaData.keySet()) {
                 List<String> value = metaData.get(key);
-                for (Iterator<String> it = value.iterator(); it.hasNext();) {
-                    String v = it.next();
+                for (String v : value) {
                     buf.append("<value name=\"").append(key).append("\">");
                     buf.append(StringUtils.escapeForXmlText(v));
                     buf.append("</value>");
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java
index df55eda33..02c66f4d3 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java
@@ -58,8 +58,8 @@ public final class MessageEventManager extends Manager {
     private static final StanzaFilter PACKET_FILTER = new AndFilter(new StanzaExtensionFilter(
                     new MessageEvent()), new NotFilter(MessageTypeFilter.ERROR));
 
-    private List<MessageEventNotificationListener> messageEventNotificationListeners = new CopyOnWriteArrayList<MessageEventNotificationListener>();
-    private List<MessageEventRequestListener> messageEventRequestListeners = new CopyOnWriteArrayList<MessageEventRequestListener>();
+    private final List<MessageEventNotificationListener> messageEventNotificationListeners = new CopyOnWriteArrayList<>();
+    private final List<MessageEventRequestListener> messageEventRequestListeners = new CopyOnWriteArrayList<>();
 
     public synchronized static MessageEventManager getInstanceFor(XMPPConnection connection) {
         MessageEventManager messageEventManager = INSTANCES.get(connection);
@@ -73,7 +73,7 @@ public final class MessageEventManager extends Manager {
     /**
      * Creates a new message event manager.
      *
-     * @param con an XMPPConnection to a XMPP server.
+     * @param connection an XMPPConnection to a XMPP server.
      */
     private MessageEventManager(XMPPConnection connection) {
         super(connection);
@@ -82,8 +82,7 @@ public final class MessageEventManager extends Manager {
             @Override
             public void processStanza(Stanza packet) {
                 Message message = (Message) packet;
-                MessageEvent messageEvent =
-                    (MessageEvent) message.getExtension("x", "jabber:x:event");
+                MessageEvent messageEvent = message.getExtension("x", "jabber:x:event");
                 if (messageEvent.isMessageEventRequest()) {
                     // Fire event for requests of message events
                     for (String eventType : messageEvent.getEventTypes())
@@ -104,7 +103,7 @@ public final class MessageEventManager extends Manager {
 
     /**
      * Adds event notification requests to a message. For each event type that
-     * the user wishes event notifications from the message recepient for, <tt>true</tt>
+     * the user wishes event notifications from the message recipient for, <tt>true</tt>
      * should be passed in to this method.
      * 
      * @param message the message to add the requested notifications.
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/MessageEventNotificationListener.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/MessageEventNotificationListener.java
index fa9cd35bc..b3840f979 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/MessageEventNotificationListener.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/MessageEventNotificationListener.java
@@ -35,7 +35,7 @@ public interface MessageEventNotificationListener {
      * @param from the user that sent the notification.
      * @param packetID the id of the message that was sent.
      */
-    public void deliveredNotification(Jid from, String packetID);
+    void deliveredNotification(Jid from, String packetID);
 
     /**
      * Called when a notification of message displayed is received.
@@ -43,7 +43,7 @@ public interface MessageEventNotificationListener {
      * @param from the user that sent the notification.
      * @param packetID the id of the message that was sent.
      */
-    public void displayedNotification(Jid from, String packetID);
+    void displayedNotification(Jid from, String packetID);
 
     /**
      * Called when a notification that the receiver of the message is composing a reply is 
@@ -52,7 +52,7 @@ public interface MessageEventNotificationListener {
      * @param from the user that sent the notification.
      * @param packetID the id of the message that was sent.
      */
-    public void composingNotification(Jid from, String packetID);
+    void composingNotification(Jid from, String packetID);
 
     /**
      * Called when a notification that the receiver of the message is offline is received.
@@ -60,7 +60,7 @@ public interface MessageEventNotificationListener {
      * @param from the user that sent the notification.
      * @param packetID the id of the message that was sent.
      */
-    public void offlineNotification(Jid from, String packetID);
+    void offlineNotification(Jid from, String packetID);
 
     /**
      * Called when a notification that the receiver of the message cancelled the reply 
@@ -69,5 +69,5 @@ public interface MessageEventNotificationListener {
      * @param from the user that sent the notification.
      * @param packetID the id of the message that was sent.
      */
-    public void cancelledNotification(Jid from, String packetID);
+    void cancelledNotification(Jid from, String packetID);
 }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/MessageEventRequestListener.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/MessageEventRequestListener.java
index 7025d971c..15d506934 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/MessageEventRequestListener.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/MessageEventRequestListener.java
@@ -52,7 +52,7 @@ public interface MessageEventRequestListener {
      * @throws NotConnectedException 
      * @throws InterruptedException 
      */
-    public void deliveredNotificationRequested(Jid from, String packetID,
+    void deliveredNotificationRequested(Jid from, String packetID,
             MessageEventManager messageEventManager) throws NotConnectedException, InterruptedException;
 
     /**
@@ -62,7 +62,7 @@ public interface MessageEventRequestListener {
      * @param packetID the id of the message that was sent.
      * @param messageEventManager the messageEventManager that fired the listener.
      */
-    public void displayedNotificationRequested(Jid from, String packetID,
+    void displayedNotificationRequested(Jid from, String packetID,
             MessageEventManager messageEventManager);
 
     /**
@@ -73,7 +73,7 @@ public interface MessageEventRequestListener {
      * @param packetID the id of the message that was sent.
      * @param messageEventManager the messageEventManager that fired the listener.
      */
-    public void composingNotificationRequested(Jid from, String packetID,
+    void composingNotificationRequested(Jid from, String packetID,
                 MessageEventManager messageEventManager);
 
     /**
@@ -83,7 +83,7 @@ public interface MessageEventRequestListener {
      * @param packetID the id of the message that was sent.
      * @param messageEventManager the messageEventManager that fired the listener.
      */
-    public void offlineNotificationRequested(Jid from, String packetID,
+    void offlineNotificationRequested(Jid from, String packetID,
             MessageEventManager messageEventManager);
 
 }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java
index 877298c40..6d1bff5f1 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java
@@ -170,7 +170,7 @@ public class MessageEvent implements ExtensionElement {
      * @return a List of all the types of events of the MessageEvent.
      */
     public List<String> getEventTypes() {
-        ArrayList<String> allEvents = new ArrayList<String>();
+        ArrayList<String> allEvents = new ArrayList<>();
         if (isDelivered()) {
             allEvents.add(MessageEvent.DELIVERED);
         }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RemoteRosterEntry.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RemoteRosterEntry.java
index 87234cef7..2f8f1aff4 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RemoteRosterEntry.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RemoteRosterEntry.java
@@ -36,9 +36,9 @@ import org.jxmpp.jid.Jid;
  */
 public class RemoteRosterEntry {
 
-    private Jid user;
-    private String name;
-    private final List<String> groupNames = new ArrayList<String>();
+    private final Jid user;
+    private final String name;
+    private final List<String> groupNames = new ArrayList<>();
 
     /**
      * Creates a new remote roster entry.
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeListener.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeListener.java
index bfbeefabb..ab029e7a4 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeListener.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeListener.java
@@ -36,6 +36,6 @@ public interface RosterExchangeListener {
      * @param remoteRosterEntries the entries sent by the user. The entries are instances of 
      * RemoteRosterEntry.
      */
-    public void entriesReceived(Jid from, Iterator<RemoteRosterEntry> remoteRosterEntries);
+    void entriesReceived(Jid from, Iterator<RemoteRosterEntry> remoteRosterEntries);
 
 }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java
index 0c0e4d1c9..468717fac 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java
@@ -77,14 +77,13 @@ public class RosterExchangeManager {
      * @param connection an XMPPConnection which is used to send and receive messages.
      */
     public RosterExchangeManager(XMPPConnection connection) {
-        weakRefConnection = new WeakReference<XMPPConnection>(connection);
+        weakRefConnection = new WeakReference<>(connection);
         // Listens for all roster exchange packets and fire the roster exchange listeners.
         packetListener = new StanzaListener() {
             @Override
             public void processStanza(Stanza packet) {
                 Message message = (Message) packet;
-                RosterExchange rosterExchange =
-                    (RosterExchange) message.getExtension(ELEMENT, NAMESPACE);
+                RosterExchange rosterExchange = message.getExtension(ELEMENT, NAMESPACE);
                 // Fire event for roster exchange listeners
                 fireRosterExchangeListeners(message.getFrom(), rosterExchange.getRosterEntries());
             }
@@ -182,13 +181,13 @@ public class RosterExchangeManager {
      * Fires roster exchange listeners.
      */
     private void fireRosterExchangeListeners(Jid from, Iterator<RemoteRosterEntry> remoteRosterEntries) {
-        RosterExchangeListener[] listeners = null;
+        RosterExchangeListener[] listeners;
         synchronized (rosterExchangeListeners) {
             listeners = new RosterExchangeListener[rosterExchangeListeners.size()];
             rosterExchangeListeners.toArray(listeners);
         }
-        for (int i = 0; i < listeners.length; i++) {
-            listeners[i].entriesReceived(from, remoteRosterEntries);
+        for (RosterExchangeListener listener : listeners) {
+            listener.entriesReceived(from, remoteRosterEntries);
         }
     }
 }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java
index d4dee4647..cb0cdebb9 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java
@@ -80,7 +80,7 @@ public class RosterExchange implements ExtensionElement {
      */
     public void addRosterEntry(RosterEntry rosterEntry) {
         // Obtain a String[] from the roster entry groups name 
-        List<String> groupNamesList = new ArrayList<String>();
+        List<String> groupNamesList = new ArrayList<>();
         String[] groupNames;
         for (RosterGroup group : rosterEntry.getGroups()) {
             groupNamesList.add(group.getName());
@@ -135,7 +135,7 @@ public class RosterExchange implements ExtensionElement {
      */
     public Iterator<RemoteRosterEntry> getRosterEntries() {
         synchronized (remoteRosterEntries) {
-            List<RemoteRosterEntry> entries = Collections.unmodifiableList(new ArrayList<RemoteRosterEntry>(remoteRosterEntries));
+            List<RemoteRosterEntry> entries = Collections.unmodifiableList(new ArrayList<>(remoteRosterEntries));
             return entries.iterator();
         }
     }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
index affc2e876..9baeb005a 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
@@ -52,16 +52,16 @@ public class RosterExchangeProvider extends ExtensionElementProvider<RosterExcha
         // CHECKSTYLE:OFF
         RosterExchange rosterExchange = new RosterExchange();
         boolean done = false;
-        RemoteRosterEntry remoteRosterEntry = null;
+        RemoteRosterEntry remoteRosterEntry;
         Jid jid = null;
 		String name = "";
-		ArrayList<String> groupsName = new ArrayList<String>();
+		ArrayList<String> groupsName = new ArrayList<>();
         while (!done) {
             int eventType = parser.next();
             if (eventType == XmlPullParser.START_TAG) {
                 if (parser.getName().equals("item")) {
                 	// Reset this variable since they are optional for each item
-					groupsName = new ArrayList<String>();
+					groupsName = new ArrayList<>();
 					// Initialize the variables from the parsed XML
                     jid = ParserUtils.getJidAttribute(parser);
                     name = parser.getAttributeValue("", "name");
diff --git a/smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/IoT.java b/smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/IoT.java
index 41f03858c..c38ea16a4 100644
--- a/smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/IoT.java
+++ b/smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/IoT.java
@@ -16,7 +16,6 @@
  */
 package org.igniterealtime.smack.smackrepl;
 
-import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeoutException;
@@ -30,7 +29,6 @@ import org.jivesoftware.smack.roster.RosterUtil;
 import org.jivesoftware.smack.tcp.XMPPTCPConnection;
 import org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration;
 import org.jivesoftware.smack.util.StringUtils;
-
 import org.jivesoftware.smackx.iot.IoTDiscoveryIntegrationTest;
 import org.jivesoftware.smackx.iot.Thing;
 import org.jivesoftware.smackx.iot.data.IoTDataManager;
@@ -56,11 +54,11 @@ public class IoT {
     private static final long TIMEOUT = 10 * 60 * 1000;
 
     private interface IotScenario {
-        void iotScenario(XMPPTCPConnection dataThingConnection, XMPPTCPConnection readinThingConnection) throws XMPPException, SmackException, IOException, InterruptedException, TimeoutException, Exception;
+        void iotScenario(XMPPTCPConnection dataThingConnection, XMPPTCPConnection readingThingConnection) throws Exception;
     }
 
     public static void iotScenario(String dataThingJidString, String dataThingPassword, String readingThingJidString,
-            String readingThingPassword, IotScenario scenario) throws TimeoutException, Exception {
+            String readingThingPassword, IotScenario scenario) throws Exception {
         final EntityBareJid dataThingJid = JidCreate.entityBareFrom(dataThingJidString);
         final EntityBareJid readingThingJid = JidCreate.entityBareFrom(readingThingJidString);
 
@@ -112,7 +110,7 @@ public class IoT {
             });
             // Wait until the thing is owned.
             syncPoint.waitForResult(TIMEOUT);
-            printStatus("OWNED - Thing now onwed by " + dataThingState.getOwner());
+            printStatus("OWNED - Thing now owned by " + dataThingState.getOwner());
 
             // Make sure things are befriended.
             IoTProvisioningManager readingThingProvisioningManager = IoTProvisioningManager.getInstanceFor(readingThingConnection);
@@ -159,7 +157,7 @@ public class IoT {
             });
             // Wait until the thing is owned.
             syncPoint.waitForResult(TIMEOUT);
-            printStatus("OWNED - Thing now onwed by " + dataThingState.getOwner());
+            printStatus("OWNED - Thing now owned by " + dataThingState.getOwner());
 
             // Now, ReadingThing sends a friendship request to data thing, which
             // will proxy the request to its provisioning service, which will
@@ -218,7 +216,7 @@ public class IoT {
         // CHECKSTYLE:ON
     }
 
-    public static void main(String[] args) throws TimeoutException, Exception {
+    public static void main(String[] args) throws Exception {
         if (args.length != 4) {
             throw new IllegalArgumentException();
         }
diff --git a/smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/TlsTest.java b/smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/TlsTest.java
index 2ebcca496..56773da72 100644
--- a/smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/TlsTest.java
+++ b/smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/TlsTest.java
@@ -94,7 +94,7 @@ public class TlsTest {
         try {
             connection.connect().login();
             if (shouldThrow) {
-                // Test not success, should have throwed on login().
+                // Test not success, should have thrown on login().
                 return false;
             }
         }
diff --git a/smack-resolver-dnsjava/src/main/java/org/jivesoftware/smack/util/dns/dnsjava/DNSJavaResolver.java b/smack-resolver-dnsjava/src/main/java/org/jivesoftware/smack/util/dns/dnsjava/DNSJavaResolver.java
index f9aeee32d..6115a4aa3 100644
--- a/smack-resolver-dnsjava/src/main/java/org/jivesoftware/smack/util/dns/dnsjava/DNSJavaResolver.java
+++ b/smack-resolver-dnsjava/src/main/java/org/jivesoftware/smack/util/dns/dnsjava/DNSJavaResolver.java
@@ -38,7 +38,7 @@ import org.xbill.DNS.Type;
  */
 public class DNSJavaResolver extends DNSResolver implements SmackInitializer {
 
-    private static DNSJavaResolver instance = new DNSJavaResolver();
+    private static final DNSJavaResolver instance = new DNSJavaResolver();
 
     public static DNSResolver getInstance() {
         return instance;
@@ -50,7 +50,7 @@ public class DNSJavaResolver extends DNSResolver implements SmackInitializer {
 
     @Override
     protected List<SRVRecord> lookupSRVRecords0(String name, List<HostAddress> failedAddresses, DnssecMode dnssecMode) {
-        List<SRVRecord> res = new ArrayList<SRVRecord>();
+        List<SRVRecord> res = new ArrayList<>();
 
         Lookup lookup;
         try {
diff --git a/smack-resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/javax/JavaxResolver.java b/smack-resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/javax/JavaxResolver.java
index f1cabcc13..335333f5c 100644
--- a/smack-resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/javax/JavaxResolver.java
+++ b/smack-resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/javax/JavaxResolver.java
@@ -50,7 +50,7 @@ public class JavaxResolver extends DNSResolver implements SmackInitializer {
 
     static {
         try {
-            Hashtable<String, String> env = new Hashtable<String, String>();
+            Hashtable<String, String> env = new Hashtable<>();
             env.put("java.naming.factory.initial", "com.sun.jndi.dns.DnsContextFactory");
             dirContext = new InitialDirContext(env);
         } catch (Exception e) {
diff --git a/smack-resolver-minidns/src/main/java/org/jivesoftware/smack/util/dns/minidns/MiniDnsResolver.java b/smack-resolver-minidns/src/main/java/org/jivesoftware/smack/util/dns/minidns/MiniDnsResolver.java
index 762065232..3aec6ea36 100644
--- a/smack-resolver-minidns/src/main/java/org/jivesoftware/smack/util/dns/minidns/MiniDnsResolver.java
+++ b/smack-resolver-minidns/src/main/java/org/jivesoftware/smack/util/dns/minidns/MiniDnsResolver.java
@@ -85,7 +85,7 @@ public class MiniDnsResolver extends DNSResolver implements SmackInitializer {
             return null;
         }
 
-        List<SRVRecord> res = new LinkedList<SRVRecord>();
+        List<SRVRecord> res = new LinkedList<>();
         for (SRV srv : result.getAnswers()) {
             String hostname = srv.name.ace;
             List<InetAddress> hostAddresses = lookupHostAddress0(hostname, failedAddresses, dnssecMode);
diff --git a/smack-sasl-javax/src/main/java/org/jivesoftware/smack/sasl/javax/SASLJavaXMechanism.java b/smack-sasl-javax/src/main/java/org/jivesoftware/smack/sasl/javax/SASLJavaXMechanism.java
index d9692b794..e316a7b46 100644
--- a/smack-sasl-javax/src/main/java/org/jivesoftware/smack/sasl/javax/SASLJavaXMechanism.java
+++ b/smack-sasl-javax/src/main/java/org/jivesoftware/smack/sasl/javax/SASLJavaXMechanism.java
@@ -146,7 +146,7 @@ public abstract class SASLJavaXMechanism extends SASLMechanism {
     }
 
     protected Map<String,String> getSaslProps() {
-        return new HashMap<String, String>();
+        return new HashMap<>();
     }
 
     protected String getServerName() {
diff --git a/smack-sasl-javax/src/test/java/org/jivesoftware/smack/sasl/javax/SASLDigestMD5Test.java b/smack-sasl-javax/src/test/java/org/jivesoftware/smack/sasl/javax/SASLDigestMD5Test.java
index b181a835e..2fd6feaac 100644
--- a/smack-sasl-javax/src/test/java/org/jivesoftware/smack/sasl/javax/SASLDigestMD5Test.java
+++ b/smack-sasl-javax/src/test/java/org/jivesoftware/smack/sasl/javax/SASLDigestMD5Test.java
@@ -19,7 +19,6 @@ package org.jivesoftware.smack.sasl.javax;
 import java.io.UnsupportedEncodingException;
 
 import org.jivesoftware.smack.SmackException;
-import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.sasl.DigestMd5SaslTest;
 
 import org.junit.Test;
@@ -32,12 +31,12 @@ public class SASLDigestMD5Test extends DigestMd5SaslTest {
     }
 
     @Test
-    public void testDigestMD5() throws NotConnectedException, SmackException, InterruptedException, XmppStringprepException, UnsupportedEncodingException {
+    public void testDigestMD5() throws SmackException, InterruptedException, XmppStringprepException, UnsupportedEncodingException {
         runTest(false);
     }
 
     @Test
-    public void testDigestMD5Authzid() throws NotConnectedException, SmackException, InterruptedException, XmppStringprepException, UnsupportedEncodingException {
+    public void testDigestMD5Authzid() throws SmackException, InterruptedException, XmppStringprepException, UnsupportedEncodingException {
         runTest(true);
     }
 }
diff --git a/smack-sasl-provided/src/main/java/org/jivesoftware/smack/sasl/provided/SASLDigestMD5Mechanism.java b/smack-sasl-provided/src/main/java/org/jivesoftware/smack/sasl/provided/SASLDigestMD5Mechanism.java
index 34cdbaf5f..fb8eb89fa 100644
--- a/smack-sasl-provided/src/main/java/org/jivesoftware/smack/sasl/provided/SASLDigestMD5Mechanism.java
+++ b/smack-sasl-provided/src/main/java/org/jivesoftware/smack/sasl/provided/SASLDigestMD5Mechanism.java
@@ -117,7 +117,7 @@ public class SASLDigestMD5Mechanism extends SASLMechanism {
             for (String part : challengeParts) {
                 String[] keyValue = part.split("=", 2);
                 String key = keyValue[0];
-                // RFC 2831 § 7.1 about the formating of the digest-challenge:
+                // RFC 2831 § 7.1 about the formatting of the digest-challenge:
                 // "The full form is "<n>#<m>element" indicating at least <n> and
                 // at most <m> elements, each separated by one or more commas
                 // (",") and OPTIONAL linear white space (LWS)."
@@ -148,7 +148,7 @@ public class SASLDigestMD5Mechanism extends SASLMechanism {
             byte[] a1FirstPart = MD5.bytes(authenticationId + ':' + serviceName + ':'
                             + password);
             cnonce = StringUtils.randomString(32);
-            byte[] a1 = ByteUtils.concact(a1FirstPart, toBytes(':' + nonce + ':' + cnonce));
+            byte[] a1 = ByteUtils.concat(a1FirstPart, toBytes(':' + nonce + ':' + cnonce));
             digestUri = "xmpp/" + serviceName;
             hex_hashed_a1 = StringUtils.encodeHex(MD5.bytes(a1));
             String responseValue = calcResponse(DigestType.ClientResponse);
diff --git a/smack-sasl-provided/src/main/java/org/jivesoftware/smack/sasl/provided/SASLPlainMechanism.java b/smack-sasl-provided/src/main/java/org/jivesoftware/smack/sasl/provided/SASLPlainMechanism.java
index 5bbf1b35c..d4647a455 100644
--- a/smack-sasl-provided/src/main/java/org/jivesoftware/smack/sasl/provided/SASLPlainMechanism.java
+++ b/smack-sasl-provided/src/main/java/org/jivesoftware/smack/sasl/provided/SASLPlainMechanism.java
@@ -43,7 +43,7 @@ public class SASLPlainMechanism extends SASLMechanism {
         byte[] authcid = toBytes(authzid + '\u0000' + authenticationId);
         byte[] passw = toBytes('\u0000' + password);
 
-        return ByteUtils.concact(authcid, passw);
+        return ByteUtils.concat(authcid, passw);
     }
 
     @Override
diff --git a/smack-sasl-provided/src/test/java/org/jivesoftware/smack/sasl/provided/SASLDigestMD5Test.java b/smack-sasl-provided/src/test/java/org/jivesoftware/smack/sasl/provided/SASLDigestMD5Test.java
index faeb50b73..7933aff63 100644
--- a/smack-sasl-provided/src/test/java/org/jivesoftware/smack/sasl/provided/SASLDigestMD5Test.java
+++ b/smack-sasl-provided/src/test/java/org/jivesoftware/smack/sasl/provided/SASLDigestMD5Test.java
@@ -19,7 +19,6 @@ package org.jivesoftware.smack.sasl.provided;
 import java.io.UnsupportedEncodingException;
 
 import org.jivesoftware.smack.SmackException;
-import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.sasl.DigestMd5SaslTest;
 
 import org.junit.Test;
@@ -31,13 +30,13 @@ public class SASLDigestMD5Test extends DigestMd5SaslTest {
     }
 
     @Test
-    public void testDigestMD5() throws NotConnectedException, SmackException, InterruptedException,
+    public void testDigestMD5() throws SmackException, InterruptedException,
                     XmppStringprepException, UnsupportedEncodingException {
         runTest(false);
     }
 
     @Test
-    public void testDigestMD5Authzid() throws NotConnectedException, SmackException, InterruptedException,
+    public void testDigestMD5Authzid() throws SmackException, InterruptedException,
                     XmppStringprepException, UnsupportedEncodingException {
         runTest(true);
     }
diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/sm/StreamManagementException.java b/smack-tcp/src/main/java/org/jivesoftware/smack/sm/StreamManagementException.java
index 43684e299..1d857f96a 100644
--- a/smack-tcp/src/main/java/org/jivesoftware/smack/sm/StreamManagementException.java
+++ b/smack-tcp/src/main/java/org/jivesoftware/smack/sm/StreamManagementException.java
@@ -74,7 +74,7 @@ public abstract class StreamManagementException extends SmackException {
                         long ackedStanzaCount,
                         List<Stanza> ackedStanzas) {
             super(
-                            "There was an error regarding the Stream Mangement counters. Server reported "
+                            "There was an error regarding the Stream Management counters. Server reported "
                                             + handledCount
                                             + " handled stanzas, which means that the "
                                             + ackedStanzaCount
diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/sm/predicates/ShortcutPredicates.java b/smack-tcp/src/main/java/org/jivesoftware/smack/sm/predicates/ShortcutPredicates.java
index 2e05bbc99..320b978a6 100644
--- a/smack-tcp/src/main/java/org/jivesoftware/smack/sm/predicates/ShortcutPredicates.java
+++ b/smack-tcp/src/main/java/org/jivesoftware/smack/sm/predicates/ShortcutPredicates.java
@@ -25,7 +25,7 @@ import org.jivesoftware.smack.packet.Stanza;
 
 public class ShortcutPredicates implements StanzaFilter {
 
-    private final Set<StanzaFilter> predicates = new LinkedHashSet<StanzaFilter>();
+    private final Set<StanzaFilter> predicates = new LinkedHashSet<>();
 
     public ShortcutPredicates() {
     }
diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/BundleAndDeferCallback.java b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/BundleAndDeferCallback.java
index 050a16485..36fa53581 100644
--- a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/BundleAndDeferCallback.java
+++ b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/BundleAndDeferCallback.java
@@ -44,6 +44,6 @@ public interface BundleAndDeferCallback {
      * @param bundleAndDefer used to premature abort bundle and defer.
      * @return the bundle and defer period in milliseconds.
      */
-    public int getBundleAndDeferMillis(BundleAndDefer bundleAndDefer);
+    int getBundleAndDeferMillis(BundleAndDefer bundleAndDefer);
 
 }
diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
index 131a0b4f9..038ec6e1b 100644
--- a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
+++ b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
@@ -175,7 +175,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
      */
     protected PacketReader packetReader;
 
-    private final SynchronizationPoint<Exception> initalOpenStreamSend = new SynchronizationPoint<>(
+    private final SynchronizationPoint<Exception> initialOpenStreamSend = new SynchronizationPoint<>(
                     this, "initial open stream element send to server");
 
     /**
@@ -237,7 +237,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
     /**
      * The server's preferred maximum resumption time in seconds.
      */
-    private int smServerMaxResumptimTime = -1;
+    private int smServerMaxResumptionTime = -1;
 
     /**
      * Indicates whether Stream Management (XEP-198) should be used if it's supported by the server.
@@ -276,13 +276,13 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
      * themselves after they have been invoked.
      * </p>
      */
-    private final Collection<StanzaListener> stanzaAcknowledgedListeners = new ConcurrentLinkedQueue<StanzaListener>();
+    private final Collection<StanzaListener> stanzaAcknowledgedListeners = new ConcurrentLinkedQueue<>();
 
     /**
      * This listeners are invoked for a acknowledged stanza that has the given stanza ID. They will
      * only be invoked once and automatically removed after that.
      */
-    private final Map<String, StanzaListener> stanzaIdAcknowledgedListeners = new ConcurrentHashMap<String, StanzaListener>();
+    private final Map<String, StanzaListener> stanzaIdAcknowledgedListeners = new ConcurrentHashMap<>();
 
     /**
      * Predicates that determine if an stream management ack should be requested from the server.
@@ -291,7 +291,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
      * order in which they are invoked in order to determine if an ack request should be send or not.
      * </p>
      */
-    private final Set<StanzaFilter> requestAckPredicates = new LinkedHashSet<StanzaFilter>();
+    private final Set<StanzaFilter> requestAckPredicates = new LinkedHashSet<>();
 
     private final XMPPTCPConnectionConfiguration config;
 
@@ -533,7 +533,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
         compressSyncPoint.init();
         smResumedSyncPoint.init();
         smEnabledSyncPoint.init();
-        initalOpenStreamSend.init();
+        initialOpenStreamSend.init();
     }
 
     @Override
@@ -563,7 +563,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
             socketFactory = SocketFactory.getDefault();
         }
         for (HostAddress hostAddress : hostAddresses) {
-            Iterator<InetAddress> inetAddresses = null;
+            Iterator<InetAddress> inetAddresses;
             String host = hostAddress.getHost();
             int port = hostAddress.getPort();
             if (proxyInfo == null) {
@@ -624,7 +624,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
      * XMPP stream to the server.
      *
      * @throws XMPPException if establishing a connection to the server fails.
-     * @throws SmackException if the server failes to respond back or if there is anther error.
+     * @throws SmackException if the server fails to respond back or if there is anther error.
      * @throws IOException 
      */
     private void initConnection() throws IOException {
@@ -831,7 +831,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
      * 
      */
     private static XMPPInputOutputStream maybeGetCompressionHandler(Compress.Feature compression) {
-        for (XMPPInputOutputStream handler : SmackConfiguration.getCompresionHandlers()) {
+        for (XMPPInputOutputStream handler : SmackConfiguration.getCompressionHandlers()) {
                 String method = handler.getCompressionMethod();
                 if (compression.getMethods().contains(method))
                     return handler;
@@ -862,7 +862,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
      * @throws NoResponseException 
      * @throws InterruptedException 
      */
-    private void maybeEnableCompression() throws NotConnectedException, NoResponseException, SmackException, InterruptedException {
+    private void maybeEnableCompression() throws SmackException, InterruptedException {
         if (!config.isCompressionEnabled()) {
             return;
         }
@@ -963,7 +963,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
     }
 
     /**
-     * Resets the parser using the latest connection's reader. Reseting the parser is necessary
+     * Resets the parser using the latest connection's reader. Resetting the parser is necessary
      * when the plain connection has been secured or when a new opening stream element is going
      * to be sent by the server.
      *
@@ -1021,12 +1021,10 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
 
         /**
          * Parse top-level packets in order to process them further.
-         *
-         * @param thread the thread that is being used by the reader to parse incoming packets.
          */
         private void parsePackets() {
             try {
-                initalOpenStreamSend.checkIfSuccessOrWait();
+                initialOpenStreamSend.checkIfSuccessOrWait();
                 int eventType = parser.getEventType();
                 while (!done) {
                     switch (eventType) {
@@ -1130,7 +1128,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
                                     smEnabledSyncPoint.reportFailure(xmppException);
                                     throw xmppException;
                                 }
-                                smServerMaxResumptimTime = enabled.getMaxResumptionTime();
+                                smServerMaxResumptionTime = enabled.getMaxResumptionTime();
                             } else {
                                 // Mark this a non-resumable stream by setting smSessionId to null
                                 smSessionId = null;
@@ -1138,7 +1136,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
                             clientHandledStanzasCount = 0;
                             smWasEnabledAtLeastOnce = true;
                             smEnabledSyncPoint.reportSuccess();
-                            LOGGER.fine("Stream Management (XEP-198): succesfully enabled");
+                            LOGGER.fine("Stream Management (XEP-198): successfully enabled");
                             break;
                         case Failed.ELEMENT:
                             Failed failed = ParseStreamManagement.failed(parser);
@@ -1260,13 +1258,13 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
     protected class PacketWriter {
         public static final int QUEUE_SIZE = XMPPTCPConnection.QUEUE_SIZE;
 
-        private final ArrayBlockingQueueWithShutdown<Element> queue = new ArrayBlockingQueueWithShutdown<Element>(
+        private final ArrayBlockingQueueWithShutdown<Element> queue = new ArrayBlockingQueueWithShutdown<>(
                         QUEUE_SIZE, true);
 
         /**
          * Needs to be protected for unit testing purposes.
          */
-        protected SynchronizationPoint<NoResponseException> shutdownDone = new SynchronizationPoint<NoResponseException>(
+        protected SynchronizationPoint<NoResponseException> shutdownDone = new SynchronizationPoint<>(
                         XMPPTCPConnection.this, "shutdown completed");
 
         /**
@@ -1317,11 +1315,11 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
         protected void throwNotConnectedExceptionIfDoneAndResumptionNotPossible() throws NotConnectedException {
             final boolean done = done();
             if (done) {
-                final boolean smResumptionPossbile = isSmResumptionPossible();
+                final boolean smResumptionPossible = isSmResumptionPossible();
                 // Don't throw a NotConnectedException is there is an resumable stream available
-                if (!smResumptionPossbile) {
+                if (!smResumptionPossible) {
                     throw new NotConnectedException(XMPPTCPConnection.this, "done=" + done
-                                    + " smResumptionPossible=" + smResumptionPossbile);
+                                    + " smResumptionPossible=" + smResumptionPossible);
                 }
             }
         }
@@ -1395,7 +1393,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
             Exception writerException = null;
             try {
                 openStream();
-                initalOpenStreamSend.reportSuccess();
+                initialOpenStreamSend.reportSuccess();
                 // Write out packets from the queue.
                 while (!done()) {
                     Element element = nextStreamElement();
@@ -1515,7 +1513,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
         }
 
         private void drainWriterQueueToUnacknowledgedStanzas() {
-            List<Element> elements = new ArrayList<Element>(queue.size());
+            List<Element> elements = new ArrayList<>(queue.size());
             queue.drainTo(elements);
             for (Element element : elements) {
                 if (element instanceof Stanza) {
@@ -1653,7 +1651,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
     /**
      * Send an unconditional Stream Management acknowledgement request to the server.
      *
-     * @throws StreamManagementNotEnabledException if Stream Mangement is not enabled.
+     * @throws StreamManagementNotEnabledException if Stream Management is not enabled.
      * @throws NotConnectedException if the connection is not connected.
      * @throws InterruptedException 
      */
@@ -1854,13 +1852,13 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
      */
     public int getMaxSmResumptionTime() {
         int clientResumptionTime = smClientMaxResumptionTime > 0 ? smClientMaxResumptionTime : Integer.MAX_VALUE;
-        int serverResumptionTime = smServerMaxResumptimTime > 0 ? smServerMaxResumptimTime : Integer.MAX_VALUE;
+        int serverResumptionTime = smServerMaxResumptionTime > 0 ? smServerMaxResumptionTime : Integer.MAX_VALUE;
         return Math.min(clientResumptionTime, serverResumptionTime);
     }
 
     private void processHandledCount(long handledCount) throws StreamManagementCounterError {
         long ackedStanzasCount = SMUtils.calculateDelta(handledCount, serverHandledStanzasCount);
-        final List<Stanza> ackedStanzas = new ArrayList<Stanza>(
+        final List<Stanza> ackedStanzas = new ArrayList<>(
                         ackedStanzasCount <= Integer.MAX_VALUE ? (int) ackedStanzasCount
                                         : Integer.MAX_VALUE);
         for (long i = 0; i < ackedStanzasCount; i++) {
diff --git a/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/PacketWriterTest.java b/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/PacketWriterTest.java
index 28f066351..cf627861f 100644
--- a/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/PacketWriterTest.java
+++ b/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/PacketWriterTest.java
@@ -31,8 +31,8 @@ import org.junit.Test;
 import org.jxmpp.stringprep.XmppStringprepException;
 
 public class PacketWriterTest {
-    volatile boolean shutdown;
-    volatile boolean prematureUnblocked;
+    private volatile boolean shutdown;
+    private volatile boolean prematureUnblocked;
 
     /**
      * Make sure that stanza(/packet) writer does block once the queue reaches