diff --git a/config/checkstyle.xml b/config/checkstyle.xml
index de313cff0..d1407ca48 100644
--- a/config/checkstyle.xml
+++ b/config/checkstyle.xml
@@ -60,6 +60,10 @@
 		<property name="format" value="^\s*[\S&amp;&amp;[^\*/]]+\s+$"/>
 		<property name="message" value="Line containing trailing whitespace character(s)"/>
 	</module>
+	<module name="RegexpSingleline">
+		<property name="format" value="^\s*//[^\s]"/>
+		<property name="message" value="Comment start ('\\') followed by non-space character. You would not continue after a punctuation without a space, would you?"/>
+	</module>
 	<module name="JavadocPackage"/>
 	<module name="TreeWalker">
 		<module name="FinalClass"/>
diff --git a/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java b/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java
index 84637ec9c..59a1b4e0f 100644
--- a/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java
+++ b/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java
@@ -532,7 +532,7 @@ public class XMPPBOSHConnection extends AbstractXMPPConnection {
                                 }
                                 break;
                             case "error":
-                                //Some bosh error isn't stream error.
+                                // Some BOSH error isn't stream error.
                                 if ("urn:ietf:params:xml:ns:xmpp-streams".equals(parser.getNamespace(null))) {
                                     throw new StreamErrorException(PacketParserUtils.parseStreamError(parser));
                                 } else {
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketConnection.java
index 4034854d4..053c1a67e 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketConnection.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketConnection.java
@@ -97,7 +97,6 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
                          | 1  |   1    |
                          +----+--------+
 */
-      //in.read(buf, 0, 2);
             fill(in, buf, 2);
 
             boolean check = false;
@@ -160,7 +159,6 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
    `failure' (STATUS value other than X'00') status, it MUST close the
    connection.
 */
-                    //in.read(buf, 0, 2);
                     fill(in, buf, 2);
                     if (buf[1] == 0)
                     {
@@ -260,7 +258,6 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
     o  BND.PORT       server bound port in network octet order
 */
 
-      //in.read(buf, 0, 4);
             fill(in, buf, 4);
 
             if (buf[1] != 0)
@@ -279,17 +276,13 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
             switch (buf[3] & 0xff)
             {
                 case 1:
-                    //in.read(buf, 0, 6);
                     fill(in, buf, 6);
                     break;
                 case 3:
-                    //in.read(buf, 0, 1);
                     fill(in, buf, 1);
-                    //in.read(buf, 0, buf[0]+2);
                     fill(in, buf, (buf[0] & 0xff) + 2);
                     break;
                 case 4:
-                    //in.read(buf, 0, 18);
                     fill(in, buf, 18);
                     break;
                 default:
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 f8a9477ce..585c84659 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java
@@ -172,7 +172,7 @@ public class StanzaCollectorTest
         catch (InterruptedException e)
         {
         }
-        //We cannot guarantee that this is going to pass due to the possible issue of timing between consumer 1 
+        // We cannot guarantee that this is going to pass due to the possible issue of timing between consumer 1 
         // and main, but the probability is extremely remote.
         assertNull(collector.pollResult());
     }
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 49e621f79..80de8ee8a 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
@@ -840,7 +840,6 @@ public final class ServiceDiscoveryManager extends Manager {
             }
             if (info.containsFeature(feature)) {
                 serviceDiscoInfo.add(info);
-                //serviceAddresses.add(item.getEntityID().asDomainBareJid());
                 if (stopOnFirst) {
                     break;
                 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/OutgoingFileTransfer.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/OutgoingFileTransfer.java
index 6756a185b..39f8f5f76 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/OutgoingFileTransfer.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/OutgoingFileTransfer.java
@@ -303,7 +303,7 @@ public class OutgoingFileTransfer extends FileTransfer {
         transferThread = new Thread(new Runnable() {
             @Override
             public void run() {
-                //Create packet filter
+                // Create packet filter.
                 try {
                     outputStream = negotiateStream(fileName, fileSize, description);
                 } catch (XMPPErrorException e) {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
index 869afc79c..04b04896c 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
@@ -2408,7 +2408,7 @@ public class MultiUserChat {
                 listener.nicknameChanged(from, mucUser.getItem().getNick());
             }
         }
-        //The room has been destroyed
+        // The room has been destroyed.
         if (mucUser.getDestroy() != null) {
             MultiUserChat alternateMUC = multiUserChatManager.getMultiUserChat(mucUser.getDestroy().getJid());
             for (UserStatusListener listener : userStatusListeners) {
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 5dd2ad0b2..c153c16da 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
@@ -704,7 +704,7 @@ public class VCard extends IQ {
     }
 
     private boolean hasContent() {
-        //noinspection OverlyComplexBooleanExpression
+        // noinspection OverlyComplexBooleanExpression
         return hasNameField()
                 || hasOrganizationFields()
                 || emailHome != null
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 9320678c1..ecc730059 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
@@ -55,8 +55,8 @@ public class VersionTest extends InitExtensions {
         assertTrue(replyPacket instanceof Version);
 
         Version reply = (Version) replyPacket;
-        //getFrom check is pending for SMACK-547
-        //assertEquals("juliet@capulet.lit/balcony", reply.getFrom());
+        // getFrom check is pending for SMACK-547
+        // assertEquals("juliet@capulet.lit/balcony", reply.getFrom());
         assertThat("capulet.lit", equalsCharSequence(reply.getTo()));
         assertEquals("s2c1", reply.getStanzaId());
         assertEquals(IQ.Type.result, reply.getType());
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 8f2fcd3c7..f954f9dbf 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
@@ -124,7 +124,7 @@ public class PingTest extends InitExtensions {
     @Test
     public void checkFailedPingToEntityError() throws Exception {
         ThreadedDummyConnection threadedCon = getAuthentiactedDummyConnection();
-        //@formatter:off
+        // @formatter:off
         String reply = 
                 "<iq type='error' id='qrzSp-16' to='test@myserver.com'>" +
                         "<ping xmlns='urn:xmpp:ping'/>" +
@@ -132,7 +132,7 @@ public class PingTest extends InitExtensions {
                             "<service-unavailable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>" +
                         "</error>" + 
                  "</iq>";
-        //@formatter:on
+        // @formatter:on
         IQ serviceUnavailable = (IQ) PacketParserUtils.parseStanza(reply);
         threadedCon.addIQReply(serviceUnavailable);
 
@@ -160,7 +160,7 @@ public class PingTest extends InitExtensions {
     @Test
     public void checkPingToServerError() throws Exception {
         ThreadedDummyConnection con = getAuthentiactedDummyConnection();
-        //@formatter:off
+        // @formatter:off
         String reply = 
                 "<iq type='error' id='qrzSp-16' to='test@myserver.com' from='" + con.getXMPPServiceDomain() + "'>" +
                         "<ping xmlns='urn:xmpp:ping'/>" +
@@ -168,7 +168,7 @@ public class PingTest extends InitExtensions {
                             "<service-unavailable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>" +
                         "</error>" + 
                  "</iq>";
-        //@formatter:on
+        // @formatter:on
         IQ serviceUnavailable = (IQ) PacketParserUtils.parseStanza(reply);
         con.addIQReply(serviceUnavailable);
 
@@ -194,13 +194,13 @@ public class PingTest extends InitExtensions {
         DiscoverInfo info = new DiscoverInfo();
         info.addFeature(Ping.NAMESPACE);
 
-        //@formatter:off
+        // @formatter:off
         String reply = 
                 "<iq type='result' id='qrzSp-16' to='test@myserver.com'>" +
                         "<query xmlns='http://jabber.org/protocol/disco#info'><identity category='client' type='pc' name='Pidgin'/>" +
                             "<feature var='urn:xmpp:ping'/>" +
                         "</query></iq>";
-        //@formatter:on
+        // @formatter:on
         IQ discoReply = (IQ) PacketParserUtils.parseStanza(reply);
         con.addIQReply(discoReply);
 
@@ -216,13 +216,13 @@ public class PingTest extends InitExtensions {
         DiscoverInfo info = new DiscoverInfo();
         info.addFeature(Ping.NAMESPACE);
 
-        //@formatter:off
+        // @formatter:off
         String reply = 
                 "<iq type='result' id='qrzSp-16' to='test@myserver.com'>" +
                         "<query xmlns='http://jabber.org/protocol/disco#info'><identity category='client' type='pc' name='Pidgin'/>" +
                             "<feature var='urn:xmpp:noping'/>" +
                         "</query></iq>";
-        //@formatter:on
+        // @formatter:on
         IQ discoReply = (IQ) PacketParserUtils.parseStanza(reply);
         con.addIQReply(discoReply);
 
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 5bbf0b383..5e7514146 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
@@ -50,7 +50,7 @@ public class DataFormTest {
 
     @Test
     public void test() throws Exception {
-        //Build a Form
+        // Build a Form.
         DataForm df = new DataForm(DataForm.Type.submit);
         String instruction = "InstructionTest1";
         df.addInstruction(instruction);
@@ -77,7 +77,7 @@ public class DataFormTest {
 
     @Test
     public void testLayout() throws Exception {
-        //Build a Form
+        // Build a Form.
         DataForm df = new DataForm(DataForm.Type.submit);
         String instruction = "InstructionTest1";
         df.addInstruction(instruction);
@@ -119,7 +119,7 @@ public class DataFormTest {
 
     @Test
     public void testValidation() throws Exception {
-        //Build a Form
+        // Build a Form.
         DataForm df = new DataForm(DataForm.Type.submit);
         String instruction = "InstructionTest1";
         df.addInstruction(instruction);
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/mam/MamIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/mam/MamIntegrationTest.java
index 587885229..940381398 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/mam/MamIntegrationTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/mam/MamIntegrationTest.java
@@ -58,7 +58,7 @@ public class MamIntegrationTest extends AbstractSmackIntegrationTest {
         EntityBareJid userOne = conOne.getUser().asEntityBareJid();
         EntityBareJid userTwo = conTwo.getUser().asEntityBareJid();
 
-        //Make sure MAM is archiving messages
+        // Make sure MAM is archiving messages.
         mamManagerConTwo.updateArchivingPreferences(null, null, MamPrefsIQ.DefaultBehavior.always);
 
         Message message = new Message(userTwo);
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 e7b0ce63b..faa03adb8 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
@@ -55,7 +55,7 @@ public abstract class AbstractOmemoIntegrationTest extends AbstractSmackIntegrat
             throw new TestNotPossibleException("Server does not support OMEMO (PubSub)");
         }
 
-        //Check for OmemoService
+        // Check for OmemoService
         if (!OmemoService.isServiceRegistered()) {
             throw new TestNotPossibleException("No OmemoService registered.");
         }
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoInitializationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoInitializationTest.java
index e019dce82..4409a449e 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoInitializationTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoInitializationTest.java
@@ -57,14 +57,14 @@ public class OmemoInitializationTest extends AbstractOmemoIntegrationTest {
      */
     @SmackIntegrationTest
     public void initializationTest() throws XMPPException.XMPPErrorException, PubSubException.NotALeafNodeException, SmackException.NotConnectedException, InterruptedException, SmackException.NoResponseException, SmackException.NotLoggedInException, CorruptedOmemoKeyException, NotAPubSubNodeException {
-        //test keys.
+        // test keys.
         setUpOmemoManager(alice);
         assertNotNull("IdentityKey must not be null after initialization.", store.loadOmemoIdentityKeyPair(alice));
         assertTrue("We must have " + OmemoConstants.TARGET_PRE_KEY_COUNT + " preKeys.",
                 store.loadOmemoPreKeys(alice).size() == OmemoConstants.TARGET_PRE_KEY_COUNT);
         assertNotNull("Our signedPreKey must not be null.", store.loadCurrentSignedPreKeyId(alice));
 
-        //Is deviceId published?
+        // Is deviceId published?
         assertTrue("Published deviceList must contain our deviceId.",
                 OmemoService.fetchDeviceList(alice, alice.getOwnJid())
                         .getDeviceIds().contains(alice.getDeviceId()));
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoIntegrationTestHelper.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoIntegrationTestHelper.java
index 78895cf08..4cbc88e7a 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoIntegrationTestHelper.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoIntegrationTestHelper.java
@@ -63,7 +63,7 @@ final class OmemoIntegrationTestHelper {
         try {
             omemoManager.requestDeviceListUpdateFor(omemoManager.getOwnJid());
         } catch (SmackException.NotConnectedException | InterruptedException | SmackException.NoResponseException e) {
-            //ignore
+            // ignore
         }
 
         CachedDeviceList deviceList = OmemoService.getInstance().getOmemoStoreBackend().loadCachedDeviceList(omemoManager, omemoManager.getOwnJid());
@@ -71,26 +71,26 @@ final class OmemoIntegrationTestHelper {
             try {
                 pm.getLeafNode(OmemoConstants.PEP_NODE_BUNDLE_FROM_DEVICE_ID(id)).deleteAllItems();
             } catch (InterruptedException | SmackException.NoResponseException | SmackException.NotConnectedException | PubSubException.NotALeafNodeException | XMPPException.XMPPErrorException | NotAPubSubNodeException e) {
-                //Silent
+                // Silent
             }
 
             try {
                 pm.deleteNode(OmemoConstants.PEP_NODE_BUNDLE_FROM_DEVICE_ID(id));
             } catch (SmackException.NoResponseException | InterruptedException | SmackException.NotConnectedException | XMPPException.XMPPErrorException e) {
-                //Silent
+                // Silent
             }
         }
 
         try {
             pm.getLeafNode(OmemoConstants.PEP_NODE_DEVICE_LIST).deleteAllItems();
         } catch (InterruptedException | SmackException.NoResponseException | SmackException.NotConnectedException | PubSubException.NotALeafNodeException | XMPPException.XMPPErrorException | NotAPubSubNodeException e) {
-            //Silent
+            // Silent
         }
 
         try {
             pm.deleteNode(OmemoConstants.PEP_NODE_DEVICE_LIST);
         } catch (SmackException.NoResponseException | InterruptedException | SmackException.NotConnectedException | XMPPException.XMPPErrorException e) {
-            //Silent
+            // Silent
         }
     }
 
@@ -100,7 +100,7 @@ final class OmemoIntegrationTestHelper {
             try {
                 roster.removeEntry(r);
             } catch (InterruptedException | SmackException.NoResponseException | SmackException.NotConnectedException | XMPPException.XMPPErrorException | SmackException.NotLoggedInException e) {
-                //Silent
+                // Silent
             }
         }
     }
@@ -128,7 +128,7 @@ final class OmemoIntegrationTestHelper {
 
 
     static void unidirectionalTrust(OmemoManager alice, OmemoManager bob) throws SmackException.NotConnectedException, InterruptedException, SmackException.NoResponseException, CannotEstablishOmemoSessionException {
-        //Fetch deviceList
+        // Fetch deviceList
         alice.requestDeviceListUpdateFor(bob.getOwnJid());
         LOGGER.log(Level.INFO, "Current deviceList state: " + alice.getOwnDevice() + " knows " + bob.getOwnDevice() + ": "
                 + OmemoService.getInstance().getOmemoStoreBackend().loadCachedDeviceList(alice, bob.getOwnJid()));
@@ -136,12 +136,12 @@ final class OmemoIntegrationTestHelper {
                 alice.getOmemoService().getOmemoStoreBackend().loadCachedDeviceList(alice, bob.getOwnJid())
                         .getActiveDevices().contains(bob.getDeviceId()));
 
-        //Create sessions
+        // Create sessions
         alice.buildSessionsWith(bob.getOwnJid());
         assertTrue("Trusting party must have a session with the other end at this point.",
                 !alice.getOmemoService().getOmemoStoreBackend().loadAllRawSessionsOf(alice, bob.getOwnJid()).isEmpty());
 
-        //Trust the other party
+        // Trust the other party
         alice.getOmemoService().getOmemoStoreBackend().trustOmemoIdentity(alice, bob.getOwnDevice(),
                 alice.getOmemoService().getOmemoStoreBackend().getFingerprint(alice, bob.getOwnDevice()));
 
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoKeyTransportTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoKeyTransportTest.java
index cb745c1d1..90cabb88b 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoKeyTransportTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoKeyTransportTest.java
@@ -79,7 +79,7 @@ public class OmemoKeyTransportTest extends AbstractOmemoIntegrationTest {
         bob.addOmemoMessageListener(new OmemoMessageListener() {
             @Override
             public void onOmemoMessageReceived(String decryptedBody, Message encryptedMessage, Message wrappingMessage, OmemoMessageInformation omemoInformation) {
-                //Don't care
+                // Don't care
             }
 
             @Override
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoMessageSendingTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoMessageSendingTest.java
index bcdc29ed3..01fe16bd3 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoMessageSendingTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoMessageSendingTest.java
@@ -101,23 +101,23 @@ public class OmemoMessageSendingTest extends AbstractOmemoIntegrationTest {
         final SimpleResultSyncPoint messageOneSyncPoint = new SimpleResultSyncPoint();
         final SimpleResultSyncPoint messageTwoSyncPoint = new SimpleResultSyncPoint();
 
-        //Subscribe to one another
+        // Subscribe to one another
         subscribe(alice, bob, "Bob");
         subscribe(bob, alice,"Alice");
 
-        //initialize OmemoManagers
+        // initialize OmemoManagers
         setUpOmemoManager(alice);
         setUpOmemoManager(bob);
 
-        //Save initial bundles
+        // Save initial bundles
         OmemoBundleElement aliceBundle = store.packOmemoBundle(alice);
         OmemoBundleElement bobsBundle = store.packOmemoBundle(bob);
 
-        //Trust
+        // Trust
         unidirectionalTrust(alice, bob);
         unidirectionalTrust(bob, alice);
 
-        //Register messageListeners
+        // Register messageListeners
         bob.addOmemoMessageListener(new OmemoMessageListener() {
             @Override
             public void onOmemoMessageReceived(String decryptedBody, Message encryptedMessage, Message wrappingMessage, OmemoMessageInformation omemoInformation) {
@@ -151,7 +151,7 @@ public class OmemoMessageSendingTest extends AbstractOmemoIntegrationTest {
             }
         });
 
-        //Prepare Alice message for Bob
+        // Prepare Alice message for Bob
         Message encryptedA = alice.encrypt(bob.getOwnJid(), alicesSecret);
         ChatManager.getInstanceFor(alice.getConnection()).chatWith(bob.getOwnJid().asEntityBareJidIfPossible())
                 .send(encryptedA);
@@ -163,11 +163,11 @@ public class OmemoMessageSendingTest extends AbstractOmemoIntegrationTest {
             TestCase.fail("Bob must have received Alice message.");
         }
 
-        //Check if Bob published a new Bundle
+        // Check if Bob published a new Bundle
         assertNotSame("Bob must have published another bundle at this point, since we used a PreKeyMessage.",
                 bobsBundle, OmemoService.fetchBundle(alice, bob.getOwnDevice()));
 
-        //Prepare Bobs response
+        // Prepare Bobs response
         Message encryptedB = bob.encrypt(alice.getOwnJid(), bobsSecret);
         ChatManager.getInstanceFor(bob.getConnection()).chatWith(alice.getOwnJid().asEntityBareJidIfPossible())
                 .send(encryptedB);
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 e79e65c34..663ae948c 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
@@ -56,7 +56,7 @@ public class OmemoStoreTest extends AbstractOmemoIntegrationTest {
     @SmackIntegrationTest
     public void storeTest() throws Exception {
 
-        //########### PRE-INITIALIZATION ############
+        // ########### PRE-INITIALIZATION ############
 
         assertEquals("Creating an OmemoManager without MUST have set the default deviceId.", alice.getDeviceId(), OmemoService.getInstance().getOmemoStoreBackend().getDefaultDeviceId(alice.getOwnJid()));
         assertEquals("OmemoManager must be equal, since both got created without giving a deviceId.", alice, bob);
@@ -69,11 +69,11 @@ public class OmemoStoreTest extends AbstractOmemoIntegrationTest {
 
         OmemoStore<?,?,?,?,?,?,?,?,?> store = OmemoService.getInstance().getOmemoStoreBackend();
         OmemoFingerprint finger = new OmemoFingerprint("FINGER");
-        //DefaultDeviceId
+        // DefaultDeviceId
         store.setDefaultDeviceId(alice.getOwnJid(), 777);
         assertEquals("defaultDeviceId setting/getting must equal.", 777, store.getDefaultDeviceId(alice.getOwnJid()));
 
-        //Trust/Distrust/Decide
+        // Trust/Distrust/Decide
         bob.shutdown();
         bob = OmemoManager.getInstanceFor(conTwo, 998);
         assertFalse("Bobs device MUST be undecided at this point",
@@ -89,7 +89,7 @@ public class OmemoStoreTest extends AbstractOmemoIntegrationTest {
         assertFalse("Bobs device MUST be untrusted at this point.",
                 store.isTrustedOmemoIdentity(alice, bob.getOwnDevice(), finger));
 
-        //Dates
+        // Dates
         assertNull("Date of last received message must be null when no message was received ever.",
                 store.getDateOfLastReceivedMessage(alice, bob.getOwnDevice()));
         Date now = new Date();
@@ -102,7 +102,7 @@ public class OmemoStoreTest extends AbstractOmemoIntegrationTest {
         assertEquals("Date of last signed prekey renewal must match our date.",
                 now, store.getDateOfLastSignedPreKeyRenewal(alice));
 
-        //Keys
+        // Keys
         assertNull("IdentityKeyPair must be null at this point.",
                 store.loadOmemoIdentityKeyPair(alice));
         assertNull("IdentityKey of contact must be null at this point.",
@@ -118,7 +118,7 @@ public class OmemoStoreTest extends AbstractOmemoIntegrationTest {
                 100, store.generateOmemoPreKeys(1, 100).size());
 
 
-        //LastPreKeyId
+        // LastPreKeyId
         assertEquals("LastPreKeyId must be 0 at this point.",
                 0, store.loadLastPreKeyId(alice));
         store.storeLastPreKeyId(alice, 1234);
@@ -126,7 +126,7 @@ public class OmemoStoreTest extends AbstractOmemoIntegrationTest {
         assertEquals("LastPreKeyId set/get must equal.", 1234, store.loadLastPreKeyId(alice));
         store.storeLastPreKeyId(alice, 0);
 
-        //CurrentSignedPreKeyId
+        // CurrentSignedPreKeyId
         assertEquals("CurrentSignedPreKeyId must be 0 at this point.",
                 0, store.loadCurrentSignedPreKeyId(alice));
         store.storeCurrentSignedPreKeyId(alice, 554);
@@ -137,10 +137,10 @@ public class OmemoStoreTest extends AbstractOmemoIntegrationTest {
 
         deletePath(alice);
 
-        //################# POST-INITIALIZATION #################
+        // ################# POST-INITIALIZATION #################
         setUpOmemoManager(alice);
 
-        //Keys
+        // Keys
         assertNotNull("IdentityKeyPair must not be null after initialization",
                 store.loadOmemoIdentityKeyPair(alice));
         assertNotSame("LastPreKeyId must not be 0 after initialization.",
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 d45d92861..84b6c7d98 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
@@ -45,7 +45,7 @@ public abstract class JingleNegotiator {
 
     private static final Logger LOGGER = Logger.getLogger(JingleNegotiator.class.getName());
 
-    //private XMPPConnection connection; // The connection associated
+    // private XMPPConnection connection; // The connection associated
 
     protected JingleSession session;
 
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 e5a0b1b4e..cda33ae3b 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
@@ -148,7 +148,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
     public JingleSession(XMPPConnection conn, JingleSessionRequest request, Jid initiator, Jid responder,
             List<JingleMediaManager> jingleMediaManagers) {
         this(conn, initiator, responder, generateSessionId(), jingleMediaManagers);
-        //sessionRequest = request; // unused
+        // sessionRequest = request; // unused
     }
 
     /**
@@ -317,7 +317,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
             // Acknowledge the IQ reception
             // Not anymore.  The state machine generates an appropriate response IQ that
             // gets sent back at the end of this routine.
-            //sendAck(iq);
+            // sendAck(iq);
 
         } catch (JingleException e) {
             // Send an error message, if present
@@ -829,7 +829,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
                     addExpectedId(jout.getStanzaId());
                     sendStanza(jout);
 
-                    //triggerSessionEstablished();
+                    // triggerSessionEstablished();
 
                 }
             }
@@ -1143,7 +1143,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
      */
     public void startIncoming() {
 
-        //updatePacketListener();
+        // updatePacketListener();
     }
 
     @Override
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 b5fad8e47..8ae50fa98 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
@@ -118,7 +118,7 @@ public class JingleSessionRequest {
             session = manager.createIncomingJingleSession(this);
             // Acknowledge the IQ reception
             session.setSid(this.getSessionID());
-            //session.sendAck(this.getJingle());
+            // session.sendAck(this.getJingle());
             session.updatePacketListener();
             session.receivePacketAndRespond(this.getJingle());
         }
@@ -135,7 +135,7 @@ public class JingleSessionRequest {
                 session = manager.createIncomingJingleSession(this);
                 // Acknowledge the IQ reception
                 session.setSid(this.getSessionID());
-                //session.sendAck(this.getJingle());
+                // session.sendAck(this.getJingle());
                 session.updatePacketListener();
                 session.terminate("Declined");
             } catch (Exception e) {
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStatePending.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStatePending.java
index 9d7e6a6e1..71e1f2a84 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStatePending.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStatePending.java
@@ -93,7 +93,7 @@ public class JingleSessionStatePending extends JingleSessionState {
 
             default:
                 // Anything other action is an error.
-                //response = createJingleError(inJingle, JingleError.OUT_OF_ORDER);
+                // response = createJingleError(inJingle, JingleError.OUT_OF_ORDER);
                 break;
         }
 
@@ -106,8 +106,8 @@ public class JingleSessionStatePending extends JingleSessionState {
     private IQ receiveContentAcceptAction(Jingle inJingle) {
 
         // According to XEP-167 the only thing we can do is ack.
-        //setSessionState(JingleSessionStateEnum.ACTIVE);
-        //return createAck(inJingle);
+        // setSessionState(JingleSessionStateEnum.ACTIVE);
+        // return createAck(inJingle);
 
         // This is now handled by the media negotiator for the matching <content> segment.
         return null;
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 be6193d6d..656fe6f65 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
@@ -49,7 +49,7 @@ public class MediaNegotiator extends JingleNegotiator {
 
     private static final Logger LOGGER = Logger.getLogger(MediaNegotiator.class.getName());
 
-    //private JingleSession session; // The session this negotiation
+    // private JingleSession session; // The session this negotiation
 
     private final JingleMediaManager mediaManager;
 
@@ -252,7 +252,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.
-            //response = createAudioPayloadTypesOffer();
+            // response = createAudioPayloadTypesOffer();
             setNegotiatorState(JingleNegotiatorState.PENDING);
         } else {
             // Don't really know what to send here.  XEP-166 is not clear.
@@ -291,7 +291,7 @@ public class MediaNegotiator extends JingleNegotiator {
                 // and send an accept if we have an agreement...
                 ptChange = !bestCommonAudioPt.equals(oldBestCommonAudioPt);
                 if (oldBestCommonAudioPt == null || ptChange) {
-                    //response = createAcceptMessage();
+                    // response = createAcceptMessage();
                 }
             } else {
                 throw new JingleException(JingleError.NO_COMMON_PAYLOAD);
@@ -319,7 +319,7 @@ public class MediaNegotiator extends JingleNegotiator {
         if (bestCommonAudioPt == null) {
             // Update the best common audio PT
             bestCommonAudioPt = calculateBestCommonAudioPt(remoteAudioPts);
-            //response = createAcceptMessage();
+            // response = createAcceptMessage();
         }
 
         offeredPayloads = description.getAudioPayloadTypesList();
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 43dd3a95b..6d718c423 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
@@ -116,7 +116,7 @@ public class JMFInit extends Frame implements Runnable {
             throw td;
         }
         catch (Throwable t) {
-            //Do nothing
+            // Do nothing.
         }
 
         Class<?> jsauto;
@@ -225,7 +225,7 @@ public class JMFInit extends Frame implements Runnable {
             }
         }
         catch (Throwable tt) {
-            //Do nothing
+            // Do nothing.
         }
     }
 
@@ -269,7 +269,7 @@ public class JMFInit extends Frame implements Runnable {
             }
         }
         catch (Throwable tt) {
-            //Do nothing
+            // Do nothing.
         }
     }
 
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 00f2bb150..108c5aea1 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
@@ -152,9 +152,9 @@ public class JmfMediaManager extends JingleMediaManager {
         // should be and put it there.
         runLinuxPreInstall();
 
-        //if (jmfProperties.length() == 0) {
+        // if (jmfProperties.length() == 0) {
         new JMFInit(null, false);
-        //}
+        // }
 
     }
 
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageReceiver.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageReceiver.java
index 5e93dad8d..c3642d6dd 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageReceiver.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageReceiver.java
@@ -146,7 +146,7 @@ public class ImageReceiver extends Canvas {
 
     public void drawTile(int x, int y, BufferedImage bufferedImage) {
         tiles[x][y] = bufferedImage;
-        //repaint(x * tileWidth, y * tileWidth, tileWidth, tileWidth);
+        // repaint(x * tileWidth, y * tileWidth, tileWidth, tileWidth);
         this.getGraphics().drawImage(bufferedImage, tileWidth * x, tileWidth * y, this);
     }
 
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 e097cf659..a1d3da9c9 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
@@ -221,8 +221,8 @@ public class ICECandidate extends TransportCandidate implements Comparable<ICECa
      */
     @Override
     public void check(final List<TransportCandidate> localCandidates) {
-        //TODO candidate is being checked trigger
-        //candidatesChecking.add(cand);
+        // TODO candidate is being checked trigger
+        // candidatesChecking.add(cand);
 
         final ICECandidate checkingCandidate = this;
 
@@ -287,8 +287,8 @@ public class ICECandidate extends TransportCandidate implements Comparable<ICECa
 
                 triggerCandidateChecked(result.isReachable());
 
-                //TODO candidate is being checked trigger
-                //candidatesChecking.remove(cand);
+                // TODO candidate is being checked trigger
+                // candidatesChecking.remove(cand);
             }
         }, "Transport candidate check");
 
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 47c0fa0b8..88054ef93 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
@@ -54,7 +54,7 @@ public class ICEResolver extends TransportResolver {
     String server;
     int port;
     static Map<String, ICENegociator> negociatorsMap = new HashMap<String, ICENegociator>();
-    //ICENegociator iceNegociator = null;
+    // ICENegociator iceNegociator = null;
 
     public ICEResolver(XMPPConnection connection, String server, int port) {
         super();
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeClient.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeClient.java
index 483461d46..34e2ae3cf 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeClient.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeClient.java
@@ -110,7 +110,7 @@ public class TcpUdpBridgeClient {
                         byte[] b = new byte[500];
 
                         int s = in.read(b);
-                        //if (s == -1) continue;
+                        // if (s == -1) continue;
 
                         LOGGER.fine("TCP Client:" + new String(b, 0, s, "UTF-8"));
 
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeServer.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeServer.java
index 92270d56b..60fa3f073 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeServer.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeServer.java
@@ -112,7 +112,7 @@ public class TcpUdpBridgeServer {
                         byte[] b = new byte[500];
 
                         int s = in.read(b);
-                        //if (s == -1) continue;
+                        // if (s == -1) continue;
 
                         LOGGER.fine("TCP Server:" + new String(b, 0, s, "UTF-8"));
 
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 3c21a246b..9665d2100 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
@@ -352,8 +352,8 @@ public abstract class TransportCandidate {
      * Subclasses should provide better methods if they can...
      */
     public void check(final List<TransportCandidate> localCandidates) {
-        //TODO candidate is being checked trigger
-        //candidatesChecking.add(cand);
+        // TODO candidate is being checked trigger
+        // candidatesChecking.add(cand);
 
         Thread checkThread = new Thread(new Runnable() {
             @Override
@@ -372,8 +372,8 @@ public abstract class TransportCandidate {
                 }
                 triggerCandidateChecked(isUsable);
 
-                //TODO candidate is being checked trigger
-                //candidatesChecking.remove(cand);
+                // TODO candidate is being checked trigger
+                // candidatesChecking.remove(cand);
             }
         }, "Transport candidate check");
 
@@ -680,7 +680,7 @@ public abstract class TransportCandidate {
 
                     socket.receive(packet);
 
-                    //LOGGER.fine("ECHO Packet Received in: " + socket.getLocalAddress().getHostAddress() + ":" + socket.getLocalPort() + " From: " + packet.getAddress().getHostAddress() + ":" + packet.getPort());
+                    // LOGGER.fine("ECHO Packet Received in: " + socket.getLocalAddress().getHostAddress() + ":" + socket.getLocalPort() + " From: " + packet.getAddress().getHostAddress() + ":" + packet.getPort());
 
                     boolean accept = false;
 
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 dcbc3e96e..f864b2ce5 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
@@ -61,7 +61,7 @@ public abstract class TransportNegotiator extends JingleNegotiator {
     public final static int CANDIDATES_ACCEPT_PERIOD = 4000;
 
     // The session this nenotiator belongs to
-    //private final JingleSession session;
+    // private final JingleSession session;
 
     // The transport manager
     private final TransportResolver resolver;
@@ -137,7 +137,7 @@ public abstract class TransportNegotiator extends JingleNegotiator {
      */
     private void setAcceptedLocalCandidate(TransportCandidate bestLocalCandidate) {
         for (int i = 0; i < resolver.getCandidateCount(); i++) {
-            //TODO FIX The EQUAL Sentence
+            // TODO FIX The EQUAL Sentence
             if (resolver.getCandidate(i).getIp().equals(bestLocalCandidate.getIp())
                     && resolver.getCandidate(i).getPort() == bestLocalCandidate.getPort()) {
                 acceptedLocalCandidate = resolver.getCandidate(i);
@@ -145,7 +145,7 @@ public abstract class TransportNegotiator extends JingleNegotiator {
             }
         }
         LOGGER.fine("BEST: ip=" + bestLocalCandidate.getIp() + " port=" + bestLocalCandidate.getPort() + " has not been offered.");
-        //throw new XMPPException("Local transport candidate has not be offered.");
+        // throw new XMPPException("Local transport candidate has not be offered.");
     }
 
     /**
@@ -316,7 +316,7 @@ public abstract class TransportNegotiator extends JingleNegotiator {
                         // Once we are in pending state, look for any valid remote
                         // candidate, and send an "accept" if we have one...
                         TransportCandidate bestRemote = getBestRemoteCandidate();
-                        //State state = getState();
+                        // State state = getState();
 
                         if ((bestRemote != null)
                                 && ((getNegotiatorState() == JingleNegotiatorState.PENDING))) {
@@ -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 reacheable.
                                     addValidRemoteCandidate(iceCandidate);
                                     foundRemoteRelay = true;
                                 }
@@ -409,7 +409,7 @@ public abstract class TransportNegotiator extends JingleNegotiator {
                         }
 
                         bestRemote = getBestRemoteCandidate();
-                        //State state = getState();
+                        // State state = getState();
                         if ((bestRemote != null)
                                 && ((getNegotiatorState() == JingleNegotiatorState.PENDING))) {
                             if (!acceptedRemoteCandidates.contains(bestRemote)) {
@@ -699,7 +699,7 @@ public abstract class TransportNegotiator extends JingleNegotiator {
         IQ response = null;
 
         // Parse the Jingle and get any proposed transport candidates
-        //addRemoteCandidates(obtainCandidatesList(jin));
+        // addRemoteCandidates(obtainCandidatesList(jin));
 
         // Start offering candidates
         sendTransportCandidatesOffer();
@@ -723,7 +723,7 @@ public abstract class TransportNegotiator extends JingleNegotiator {
         IQ response = null;
 
         // Parse the Jingle and get any proposed transport candidates
-        //addRemoteCandidates(obtainCandidatesList(jin));
+        // addRemoteCandidates(obtainCandidatesList(jin));
 
         //        // Start offering candidates
         //        sendTransportCandidatesOffer();
@@ -771,7 +771,7 @@ public abstract class TransportNegotiator extends JingleNegotiator {
 
             if (isEstablished()) {
                 LOGGER.fine(cand.getIp() + " is set active");
-                //setNegotiatorState(JingleNegotiatorState.SUCCEEDED);
+                // setNegotiatorState(JingleNegotiatorState.SUCCEEDED);
             }
         }
         return response;
@@ -785,9 +785,9 @@ public abstract class TransportNegotiator extends JingleNegotiator {
         IQ response = null;
 
         LOGGER.fine("Transport stabilished");
-        //triggerTransportEstablished(getAcceptedLocalCandidate(), getBestRemoteCandidate());
+        // triggerTransportEstablished(getAcceptedLocalCandidate(), getBestRemoteCandidate());
 
-        //setNegotiatorState(JingleNegotiatorState.SUCCEEDED);
+        // setNegotiatorState(JingleNegotiatorState.SUCCEEDED);
 
         return response;
     }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleTransportProvider.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleTransportProvider.java
index 94dcb81e3..22b5ac4f0 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleTransportProvider.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleTransportProvider.java
@@ -232,7 +232,7 @@ public abstract class JingleTransportProvider extends ExtensionElementProvider<J
             String name = parser.getAttributeValue("", "name");
             String port = parser.getAttributeValue("", "port");
 
-            //LOGGER.debug();
+            // LOGGER.debug();
 
             if (generation != null) {
                 try {
diff --git a/smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoKeyUtil.java b/smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoKeyUtil.java
index 893f13ab7..1306b790c 100644
--- a/smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoKeyUtil.java
+++ b/smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoKeyUtil.java
@@ -210,7 +210,7 @@ public class SignalOmemoKeyUtil extends OmemoKeyUtil<IdentityKeyPair, IdentityKe
     @Override
     public OmemoFingerprint getFingerprint(IdentityKey identityKey) {
         String fp = identityKey.getFingerprint();
-        //Cut "(byte)0x" prefixes, remove spaces and commas, cut first two digits.
+        // Cut "(byte)0x" prefixes, remove spaces and commas, cut first two digits.
         fp = fp.replace("(byte)0x", "").replace(",", "").replace(" ", "").substring(2);
         return new OmemoFingerprint(fp);
     }
diff --git a/smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoStoreConnector.java b/smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoStoreConnector.java
index 823ed9bd7..f82a0ddda 100644
--- a/smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoStoreConnector.java
+++ b/smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoStoreConnector.java
@@ -96,8 +96,8 @@ public class SignalOmemoStoreConnector
 
     @Override
     public boolean isTrustedIdentity(SignalProtocolAddress signalProtocolAddress, IdentityKey identityKey) {
-        //Disable internal trust management. Instead we use OmemoStore.isTrustedOmemoIdentity() before encrypting for a
-        //recipient.
+        // Disable internal trust management. Instead we use OmemoStore.isTrustedOmemoIdentity() before encrypting for a
+        // recipient.
         return true;
     }
 
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/FileBasedOmemoStore.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/FileBasedOmemoStore.java
index a95d80760..f744f0b80 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/FileBasedOmemoStore.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/FileBasedOmemoStore.java
@@ -317,7 +317,7 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
                 preKeys.put(Integer.parseInt(f.getName()), p);
 
             } catch (IOException e) {
-                //Do nothing
+                // Do nothing.
             }
         }
         return preKeys;
@@ -355,7 +355,7 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
                 signedPreKeys.put(Integer.parseInt(f.getName()), p);
 
             } catch (IOException e) {
-                //Do nothing
+                // Do nothing.
             }
         }
         return signedPreKeys;
@@ -414,7 +414,7 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
                 sessions.put(id, s);
 
             } catch (IOException e) {
-                //Do nothing
+                // Do nothing.
             }
         }
         return sessions;
@@ -469,7 +469,7 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
             return null;
         }
 
-        //active
+        // active
         File activeDevicesPath = hierarchy.getContactsActiveDevicesPath(omemoManager, contact);
         try {
             cachedDeviceList.getActiveDevices().addAll(readIntegers(activeDevicesPath));
@@ -477,12 +477,12 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
             // Don't worry...
         }
 
-        //inactive
+        // inactive
         File inactiveDevicesPath = hierarchy.getContactsInactiveDevicesPath(omemoManager, contact);
         try {
             cachedDeviceList.getInactiveDevices().addAll(readIntegers(inactiveDevicesPath));
         } catch (IOException e) {
-            //It's ok :)
+            // It's ok :)
         }
 
         return cachedDeviceList;
@@ -631,7 +631,7 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
             throw new IOException("Could not write bytes to null-path.");
         }
 
-        //Create file
+        // Create file
         FileHierarchy.createFile(target);
 
         IOException io = null;
@@ -730,7 +730,7 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
                     integers.add(in.readInt());
                 }
             } catch (EOFException e) {
-                //Reached end of the list.
+                // Reached end of the list.
             }
 
         } catch (IOException e) {
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoManager.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoManager.java
index dffd0c94b..61f3f7010 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoManager.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoManager.java
@@ -178,7 +178,7 @@ public final class OmemoManager extends Manager {
         if (connection.getUser() != null) {
             user = connection.getUser().asBareJid();
         } else {
-            //This might be dangerous
+            // This might be dangerous
             try {
                 user = JidCreate.bareFrom(((AbstractXMPPConnection) connection).getConfiguration().getUsername());
             } catch (XmppStringprepException e) {
@@ -406,7 +406,7 @@ public final class OmemoManager extends Manager {
      * @throws CorruptedOmemoKeyException
      */
     public void regenerate() throws SmackException, InterruptedException, XMPPException.XMPPErrorException, CorruptedOmemoKeyException {
-        //create a new identity and publish new keys to the server
+        // create a new identity and publish new keys to the server
         getOmemoService().regenerate(this, null);
         getOmemoService().publishDeviceIdIfNeeded(this,false);
         getOmemoService().publishBundle(this);
@@ -622,9 +622,9 @@ public final class OmemoManager extends Manager {
      * @throws PubSubException.NotALeafNodeException if the bundle node on the server is a CollectionNode
      */
     public void rotateSignedPreKey() throws CorruptedOmemoKeyException, InterruptedException, XMPPException.XMPPErrorException, SmackException.NotConnectedException, SmackException.NoResponseException, PubSubException.NotALeafNodeException {
-        //generate key
+        // generate key
         getOmemoService().getOmemoStoreBackend().changeSignedPreKey(this);
-        //publish
+        // publish
         getOmemoService().publishDeviceIdIfNeeded(this, false);
         getOmemoService().publishBundle(this);
     }
@@ -788,31 +788,31 @@ public final class OmemoManager extends Manager {
                         continue;
                     }
 
-                    //Device List <list>
+                    // Device List <list>
                     OmemoDeviceListVAxolotlElement omemoDeviceListElement = (OmemoDeviceListVAxolotlElement) payloadItem.getPayload();
                     int ourDeviceId = getDeviceId();
                     getOmemoService().getOmemoStoreBackend().mergeCachedDeviceList(OmemoManager.this, from, omemoDeviceListElement);
 
                     if (from == null) {
-                        //Unknown sender, no more work to do.
-                        //TODO: This DOES happen for some reason. Figure out when...
+                        // Unknown sender, no more work to do.
+                        // TODO: This DOES happen for some reason. Figure out when...
                         continue;
                     }
 
                     if (!from.equals(getOwnJid())) {
-                        //Not our deviceList, so nothing more to do
+                        // Not our deviceList, so nothing more to do
                         continue;
                     }
 
                     if (omemoDeviceListElement.getDeviceIds().contains(ourDeviceId)) {
-                        //We are on the list. Nothing more to do
+                        // We are on the list. Nothing more to do
                         continue;
                     }
 
-                    //Our deviceList and we are not on it! We don't want to miss all the action!!!
+                    // Our deviceList and we are not on it! We don't want to miss all the action!!!
                     LOGGER.log(Level.INFO, "Our deviceId was not on the list!");
                     Set<Integer> deviceListIds = omemoDeviceListElement.copyDeviceIds();
-                    //enroll at the deviceList
+                    // enroll at the deviceList
                     deviceListIds.add(ourDeviceId);
                     final OmemoDeviceListVAxolotlElement newOmemoDeviceListElement = new OmemoDeviceListVAxolotlElement(deviceListIds);
 
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
index 3c357b7ed..044c4f570 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
@@ -190,7 +190,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
             throws NoSuchPaddingException, InvalidKeyException, UnsupportedEncodingException, IllegalBlockSizeException,
             BadPaddingException, NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
 
-        //Check availability of algorithms and encodings needed for crypto
+        // Check availability of algorithms and encodings needed for crypto
         checkAvailableAlgorithms();
     }
 
@@ -214,12 +214,12 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
         boolean mustPublishId = false;
         if (getOmemoStoreBackend().isFreshInstallation(omemoManager)) {
             LOGGER.log(Level.INFO, "No key material found. Looks like we have a fresh installation.");
-            //Create new key material and publish it to the server
+            // Create new key material and publish it to the server
             regenerate(omemoManager, omemoManager.getDeviceId());
             mustPublishId = true;
         }
 
-        //Get fresh device list from server
+        // Get fresh device list from server
         mustPublishId |= refreshOwnDeviceList(omemoManager);
 
         publishDeviceIdIfNeeded(omemoManager, false, mustPublishId);
@@ -244,7 +244,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
     protected static void checkAvailableAlgorithms() throws NoSuchPaddingException, UnsupportedEncodingException,
             InvalidAlgorithmParameterException, NoSuchAlgorithmException, IllegalBlockSizeException, BadPaddingException,
             NoSuchProviderException, InvalidKeyException {
-        //Test crypto functions
+        // Test crypto functions
         new OmemoMessageBuilder<>(null, null, "");
     }
 
@@ -257,7 +257,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
      *                                  (should never ever happen *crosses fingers*)
      */
     void regenerate(OmemoManager omemoManager, Integer nDeviceId) throws CorruptedOmemoKeyException {
-        //Generate unique ID that is not already taken
+        // Generate unique ID that is not already taken
         while (nDeviceId == null || !getOmemoStoreBackend().isAvailableDeviceId(omemoManager, nDeviceId)) {
             nDeviceId = OmemoManager.randomDeviceId();
         }
@@ -292,7 +292,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
             getOmemoStoreBackend().setDateOfLastSignedPreKeyRenewal(omemoManager);
         }
 
-        //publish
+        // publish
         PubSubManager.getInstance(omemoManager.getConnection(), omemoManager.getOwnJid())
                 .tryToPublishAndPossibleAutoCreate(OmemoConstants.PEP_NODE_BUNDLE_FROM_DEVICE_ID(omemoManager.getDeviceId()),
                         new PayloadItem<>(getOmemoStoreBackend().packOmemoBundle(omemoManager)));
@@ -369,12 +369,12 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
     boolean removeStaleDevicesIfNeeded(OmemoManager omemoManager, Set<Integer> deviceListIds) {
         boolean publish = false;
         int ownDeviceId = omemoManager.getDeviceId();
-        //Clear devices that we didn't receive a message from for a while
+        // Clear devices that we didn't receive a message from for a while
         Iterator<Integer> it = deviceListIds.iterator();
         while (OmemoConfiguration.getDeleteStaleDevices() && it.hasNext()) {
             int id = it.next();
             if (id == ownDeviceId) {
-                //Skip own id
+                // Skip own id
                 continue;
             }
 
@@ -601,11 +601,11 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
         for (int id : devices.getActiveDevices()) {
             OmemoDevice device = new OmemoDevice(jid, id);
             if (getOmemoStoreBackend().containsRawSession(omemoManager, device)) {
-                //We have a session already.
+                // We have a session already.
                 continue;
             }
 
-            //Build missing session
+            // Build missing session
             try {
                 buildSessionFromOmemoBundle(omemoManager, device, false);
             } catch (CannotEstablishOmemoSessionException e) {
@@ -648,7 +648,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
             return;
         }
 
-        //Do not build sessions with devices we already know...
+        // Do not build sessions with devices we already know...
         if (!fresh && getOmemoStoreBackend().containsRawSession(omemoManager, device)) {
             getOmemoStoreBackend().getOmemoSessionOf(omemoManager, device); //Make sure its loaded though
             return;
@@ -663,10 +663,10 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
 
         HashMap<Integer, T_Bundle> bundles = getOmemoStoreBackend().keyUtil().BUNDLE.bundles(bundle, device);
 
-        //Select random Bundle
+        // Select random Bundle
         int randomIndex = new Random().nextInt(bundles.size());
         T_Bundle randomPreKeyBundle = new ArrayList<>(bundles.values()).get(randomIndex);
-        //Build raw session
+        // Build raw session
         processBundle(omemoManager, randomPreKeyBundle, device);
     }
 
@@ -701,9 +701,9 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
             CryptoFailedException, XMPPException.XMPPErrorException, CorruptedOmemoKeyException {
 
         ArrayList<OmemoVAxolotlElement.OmemoHeader.Key> messageRecipientKeys = message.getHeader().getKeys();
-        //Do we have a key with our ID in the message?
+        // Do we have a key with our ID in the message?
         for (OmemoVAxolotlElement.OmemoHeader.Key k : messageRecipientKeys) {
-            //Only decrypt with our deviceID
+            // Only decrypt with our deviceID
             if (k.getId() != omemoManager.getDeviceId()) {
                 continue;
             }
@@ -785,7 +785,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
             throws CryptoFailedException, UndecidedOmemoIdentityException, NoSuchAlgorithmException, SmackException.NotConnectedException, InterruptedException, SmackException.NoResponseException, CannotEstablishOmemoSessionException {
 
         CannotEstablishOmemoSessionException sessionException = null;
-        //Them - The contact wants to read the message on all their devices.
+        // Them - The contact wants to read the message on all their devices.
         HashMap<BareJid, ArrayList<OmemoDevice>> receivers = new HashMap<>();
         for (BareJid recipient : recipients) {
             try {
@@ -820,7 +820,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
             }
         }
 
-        //Us - We want to read the message on all of our devices
+        // Us - We want to read the message on all of our devices
         CachedDeviceList ourDevices = getOmemoStoreBackend().loadCachedDeviceList(omemoManager, omemoManager.getOwnJid());
         if (ourDevices == null) {
             ourDevices = new CachedDeviceList();
@@ -830,7 +830,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
         for (int id : ourDevices.getActiveDevices()) {
             OmemoDevice ourDevice = new OmemoDevice(omemoManager.getOwnJid(), id);
             if (id == omemoManager.getDeviceId()) {
-                //Don't build session with our exact device.
+                // Don't build session with our exact device.
                 continue;
             }
 
@@ -957,11 +957,11 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
                 try {
                     builder.addRecipient(c);
                 } catch (CorruptedOmemoKeyException e) {
-                    //TODO: How to react?
+                    // TODO: How to react?
                     LOGGER.log(Level.SEVERE, "encryptOmemoMessage failed to establish a session with device "
                             + c + ": " + e.getMessage());
                 } catch (UndecidedOmemoIdentityException e) {
-                    //Collect all undecided devices
+                    // Collect all undecided devices
                     if (undecided == null) {
                         undecided = e;
                     } else {
@@ -1132,7 +1132,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
         List<ClearTextMessage> result = new ArrayList<>();
         for (Forwarded f : mamQueryResult.forwardedMessages) {
             if (OmemoManager.stanzaContainsOmemoElement(f.getForwardedStanza())) {
-                //Decrypt OMEMO messages
+                // Decrypt OMEMO messages
                 try {
                     result.add(processLocalMessage(omemoManager, f.getForwardedStanza().getFrom().asBareJid(), (Message) f.getForwardedStanza()));
                 } catch (NoRawSessionException | CorruptedOmemoKeyException | CryptoFailedException e) {
@@ -1140,7 +1140,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
                             + f.getForwardedStanza().getFrom() + " due to corrupted session/key: " + e.getMessage());
                 }
             } else {
-                //Wrap cleartext messages
+                // Wrap cleartext messages
                 Message m = (Message) f.getForwardedStanza();
                 result.add(new ClearTextMessage(m.getBody(), m,
                         new OmemoMessageInformation(null, null, OmemoMessageInformation.CARBON.NONE, false)));
@@ -1210,7 +1210,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
             MultiUserChatManager mucm = MultiUserChatManager.getInstanceFor(omemoManager.getConnection());
             OmemoDevice senderDevice = getSender(omemoManager, stanza);
             try {
-                //Is it a MUC message...
+                // Is it a MUC message...
                 if (isMucMessage(omemoManager, stanza)) {
 
                     MultiUserChat muc = mucm.getMultiUserChat(stanza.getFrom().asEntityBareJidIfPossible());
@@ -1231,7 +1231,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
                         }
                     }
                 }
-                //... or a normal chat message...
+                // ... or a normal chat message...
                 else {
                     if (omemoMessage.isMessageElement()) {
 
@@ -1304,7 +1304,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
                 }
 
                 try {
-                    //Is it a MUC message...
+                    // Is it a MUC message...
                     if (isMucMessage(omemoManager, carbonCopy)) {
 
                         MultiUserChat muc = mucm.getMultiUserChat(carbonCopy.getFrom().asEntityBareJidIfPossible());
@@ -1325,7 +1325,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
                             }
                         }
                     }
-                    //... or a normal chat message...
+                    // ... or a normal chat message...
                     else {
                         if (omemoMessage.isMessageElement()) {
 
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoStore.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoStore.java
index 298c57f38..1fe6fa279 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoStore.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoStore.java
@@ -84,14 +84,14 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
     boolean isAvailableDeviceId(OmemoManager omemoManager, int id) {
         LOGGER.log(Level.INFO, "Check if id " + id + " is available...");
 
-        //Lookup local cached device list
+        // Lookup local cached device list
         BareJid ownJid = omemoManager.getOwnJid();
         CachedDeviceList cachedDeviceList = loadCachedDeviceList(omemoManager, ownJid);
 
         if (cachedDeviceList == null) {
             cachedDeviceList = new CachedDeviceList();
         }
-        //Does the list already contain that id?
+        // Does the list already contain that id?
         return !cachedDeviceList.contains(id);
     }
 
@@ -220,7 +220,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
      */
     void initializeOmemoSessions(OmemoManager omemoManager) {
 
-        //Get HashMap of our omemoSessions
+        // Get HashMap of our omemoSessions
         HashMap<OmemoDevice, OmemoSession<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Sess, T_Addr, T_ECPub, T_Bundle, T_Ciph>>
                 sessions = omemoSessions.get(omemoManager);
         if (sessions == null) {
@@ -228,12 +228,12 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
             omemoSessions.put(omemoManager, sessions);
         }
 
-        //Sessions with our own devices
+        // Sessions with our own devices
         HashMap<Integer, T_Sess> ourRawSessions = loadAllRawSessionsOf(omemoManager, omemoManager.getOwnJid());
         ourRawSessions.remove(omemoManager.getDeviceId()); //Just to make sure we have no session with ourselves...
         sessions.putAll(createOmemoSessionsFromRawSessions(omemoManager, omemoManager.getOwnJid(), ourRawSessions));
 
-        //Sessions with contacts
+        // Sessions with contacts
         for (RosterEntry rosterEntry : Roster.getInstanceFor(omemoManager.getConnection()).getEntries()) {
             HashMap<Integer, T_Sess> contactDevices = loadAllRawSessionsOf(omemoManager, rosterEntry.getJid().asBareJid());
             sessions.putAll(createOmemoSessionsFromRawSessions(omemoManager, rosterEntry.getJid().asBareJid(), contactDevices));
@@ -284,7 +284,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
 
         OmemoSession<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Sess, T_Addr, T_ECPub, T_Bundle, T_Ciph>
                 session = sessions.get(device);
-        //No OmemoSession found
+        // No OmemoSession found
         if (session == null) {
             T_IdKey identityKey = null;
             try {
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/internal/OmemoSession.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/internal/OmemoSession.java
index 9674b6afc..119137387 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/internal/OmemoSession.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/internal/OmemoSession.java
@@ -129,9 +129,9 @@ public abstract class OmemoSession<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
 
         if (unpackedKey.length == 32) {
             authTag = new byte[16];
-            //copy key part into messageKey
+            // copy key part into messageKey
             System.arraycopy(unpackedKey, 0, messageKey, 0, 16);
-            //copy tag part into authTag
+            // copy tag part into authTag
             System.arraycopy(unpackedKey, 16, authTag, 0,16);
         } else if (element.isKeyTransportElement() && unpackedKey.length == 16) {
             messageKey = unpackedKey;
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/OmemoConstants.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/OmemoConstants.java
index 442da7a24..7ed0a1994 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/OmemoConstants.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/OmemoConstants.java
@@ -22,14 +22,14 @@ package org.jivesoftware.smackx.omemo.util;
  */
 public final class OmemoConstants {
 
-    //Constants
+    // Constants
     /**
      * Omemo related namespace.
      */
     public static final String OMEMO_NAMESPACE_V_AXOLOTL = "eu.siacs.conversations.axolotl";
     public static final String OMEMO = "OMEMO";
 
-    //PubSub Node names
+    // PubSub Node names
     public static final String PEP_NODE_DEVICE_LIST = OMEMO_NAMESPACE_V_AXOLOTL + ".devicelist";
     public static final String PEP_NODE_DEVICE_LIST_NOTIFY = PEP_NODE_DEVICE_LIST + "+notify";
     public static final String PEP_NODE_BUNDLES = OMEMO_NAMESPACE_V_AXOLOTL + ".bundles";
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/OmemoMessageBuilder.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/OmemoMessageBuilder.java
index ab2e617be..066a73c6a 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/OmemoMessageBuilder.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/OmemoMessageBuilder.java
@@ -144,7 +144,7 @@ public class OmemoMessageBuilder<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
             return;
         }
 
-        //Encrypt message body
+        // Encrypt message body
         SecretKey secretKey = new SecretKeySpec(messageKey, KEYTYPE);
         IvParameterSpec ivSpec = new IvParameterSpec(initializationVector);
         Cipher cipher = Cipher.getInstance(CIPHERMODE, PROVIDER);
@@ -194,12 +194,12 @@ public class OmemoMessageBuilder<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
 
         if (session != null) {
             if (!ignoreTrust && !omemoStore.isDecidedOmemoIdentity(omemoManager, device, session.getIdentityKey())) {
-                //Warn user of undecided device
+                // Warn user of undecided device
                 throw new UndecidedOmemoIdentityException(device);
             }
 
             if (!ignoreTrust && omemoStore.isTrustedOmemoIdentity(omemoManager, device, session.getIdentityKey())) {
-                //Encrypt key and save to header
+                // Encrypt key and save to header
                 CiphertextTuple encryptedKey = session.encryptMessageKey(messageKey);
                 keys.add(new OmemoVAxolotlElement.OmemoHeader.Key(encryptedKey.getCiphertext(), device.getDeviceId(), encryptedKey.isPreKeyMessage()));
             }
diff --git a/smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoConfigurationTest.java b/smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoConfigurationTest.java
index 09fad8544..bc00dcb38 100644
--- a/smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoConfigurationTest.java
+++ b/smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoConfigurationTest.java
@@ -107,7 +107,7 @@ public class OmemoConfigurationTest {
             OmemoConfiguration.setMaxNumberOfStoredSignedPreKeys(0);
             TestCase.fail("OmemoConfiguration.setMaxNumberOfStoredSignedPreKeys should not accept values <= 0");
         } catch (IllegalArgumentException e) {
-            //Expected
+            // Expected
         }
     }
 }
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 c604dc675..27d8adb3a 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
@@ -725,8 +725,8 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
             else if ("Apple".equals(keyStoreType)) {
                 ks = KeyStore.getInstance("KeychainStore","Apple");
                 ks.load(null,null);
-                //pcb = new PasswordCallback("Apple Keychain",false);
-                //pcb.setPassword(null);
+                // pcb = new PasswordCallback("Apple Keychain",false);
+                // pcb.setPassword(null);
             }
             else if (keyStoreType != null) {
                 ks = KeyStore.getInstance(keyStoreType);