diff --git a/java/jni/ZT_jniutils.h b/java/jni/ZT_jniutils.h
index a9dc40e48..6b911c5ef 100644
--- a/java/jni/ZT_jniutils.h
+++ b/java/jni/ZT_jniutils.h
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- 
+
 #ifndef ZT_jniutils_h_
 #define ZT_jniutils_h_
 
@@ -61,8 +61,6 @@ jobject createVirtualNetworkConfigOperation(JNIEnv *env, ZT_VirtualNetworkConfig
 jobject newInetSocketAddress(JNIEnv *env, const sockaddr_storage &addr);
 jobject newInetAddress(JNIEnv *env, const sockaddr_storage &addr);
 
-jobject newMulticastGroup(JNIEnv *env, const ZT_MulticastGroup &mc);
-
 jobject newPeer(JNIEnv *env, const ZT_Peer &peer);
 jobject newPeerPhysicalPath(JNIEnv *env, const ZT_PeerPhysicalPath &ppp);
 
@@ -74,4 +72,4 @@ jobject newVirtualNetworkRoute(JNIEnv *env, const ZT_VirtualNetworkRoute &route)
 
 jobject newVirtualNetworkDNS(JNIEnv *env, const ZT_VirtualNetworkDNS &dns);
 
-#endif
+#endif // ZT_jniutils_h_
diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp
index 9b5a6fbd6..4fcb939ef 100644
--- a/java/jni/com_zerotierone_sdk_Node.cpp
+++ b/java/jni/com_zerotierone_sdk_Node.cpp
@@ -1631,4 +1631,4 @@ JNIEXPORT jobjectArray JNICALL Java_com_zerotier_sdk_Node_networks(
 
 #ifdef __cplusplus
 } // extern "C"
-#endif
\ No newline at end of file
+#endif
diff --git a/java/src/com/zerotier/sdk/DataStoreGetListener.java b/java/src/com/zerotier/sdk/DataStoreGetListener.java
index 317511e0c..273c94363 100644
--- a/java/src/com/zerotier/sdk/DataStoreGetListener.java
+++ b/java/src/com/zerotier/sdk/DataStoreGetListener.java
@@ -24,6 +24,7 @@
  * redistribute it in a modified binary form, please contact ZeroTier Networks
  * LLC. Start here: http://www.zerotier.com/
  */
+
 package com.zerotier.sdk;
 
 public interface DataStoreGetListener {
diff --git a/java/src/com/zerotier/sdk/DataStorePutListener.java b/java/src/com/zerotier/sdk/DataStorePutListener.java
index 77e55027e..bb9e089fa 100644
--- a/java/src/com/zerotier/sdk/DataStorePutListener.java
+++ b/java/src/com/zerotier/sdk/DataStorePutListener.java
@@ -24,6 +24,7 @@
  * redistribute it in a modified binary form, please contact ZeroTier Networks
  * LLC. Start here: http://www.zerotier.com/
  */
+
 package com.zerotier.sdk;
 
 public interface DataStorePutListener {
diff --git a/java/src/com/zerotier/sdk/Event.java b/java/src/com/zerotier/sdk/Event.java
index 22d350e1e..d0f314e9a 100644
--- a/java/src/com/zerotier/sdk/Event.java
+++ b/java/src/com/zerotier/sdk/Event.java
@@ -28,6 +28,7 @@
 package com.zerotier.sdk;
 
 public enum Event {
+
     /**
      * Node has been initialized
      *
diff --git a/java/src/com/zerotier/sdk/EventListener.java b/java/src/com/zerotier/sdk/EventListener.java
index 91050aaa9..5dbe3da71 100644
--- a/java/src/com/zerotier/sdk/EventListener.java
+++ b/java/src/com/zerotier/sdk/EventListener.java
@@ -27,13 +27,11 @@
 
 package com.zerotier.sdk;
 
-import java.net.InetSocketAddress;
-import java.lang.String;
-
 /**
  * Interface to handle callbacks for ZeroTier One events.
  */
 public interface EventListener {
+
     /**
      * Callback for events with no other associated metadata
      * 
diff --git a/java/src/com/zerotier/sdk/Node.java b/java/src/com/zerotier/sdk/Node.java
index 1b3a4901f..0e9c4ee83 100644
--- a/java/src/com/zerotier/sdk/Node.java
+++ b/java/src/com/zerotier/sdk/Node.java
@@ -472,4 +472,4 @@ public class Node {
     private native Peer[] peers(long nodeId);
 
     private native VirtualNetworkConfig[] networks(long nodeId);
-}
\ No newline at end of file
+}
diff --git a/java/src/com/zerotier/sdk/NodeException.java b/java/src/com/zerotier/sdk/NodeException.java
index 1fdef72f8..75baf9d30 100644
--- a/java/src/com/zerotier/sdk/NodeException.java
+++ b/java/src/com/zerotier/sdk/NodeException.java
@@ -33,4 +33,4 @@ public class NodeException extends RuntimeException {
     public NodeException(String message) {
         super(message);
     }
-}
\ No newline at end of file
+}
diff --git a/java/src/com/zerotier/sdk/PacketSender.java b/java/src/com/zerotier/sdk/PacketSender.java
index 06ec01bcc..1a4d4524e 100644
--- a/java/src/com/zerotier/sdk/PacketSender.java
+++ b/java/src/com/zerotier/sdk/PacketSender.java
@@ -24,12 +24,14 @@
  * redistribute it in a modified binary form, please contact ZeroTier Networks
  * LLC. Start here: http://www.zerotier.com/
  */
+
 package com.zerotier.sdk;
 
 import java.net.InetSocketAddress;
 
 
 public interface PacketSender {
+
     /**
      * Function to send a ZeroTier packet out over the wire
      *
diff --git a/java/src/com/zerotier/sdk/PathChecker.java b/java/src/com/zerotier/sdk/PathChecker.java
index 6bf31df2b..459dde122 100644
--- a/java/src/com/zerotier/sdk/PathChecker.java
+++ b/java/src/com/zerotier/sdk/PathChecker.java
@@ -8,6 +8,7 @@ package com.zerotier.sdk;
 import java.net.InetSocketAddress;
 
 public interface PathChecker {
+
     /**
      * Callback to check whether a path should be used for ZeroTier traffic
      *
diff --git a/java/src/com/zerotier/sdk/Peer.java b/java/src/com/zerotier/sdk/Peer.java
index eb3d71300..63ef689b1 100644
--- a/java/src/com/zerotier/sdk/Peer.java
+++ b/java/src/com/zerotier/sdk/Peer.java
@@ -91,4 +91,4 @@ public final class Peer {
     public final PeerPhysicalPath[] paths() {
         return paths;
     }
-}
\ No newline at end of file
+}
diff --git a/java/src/com/zerotier/sdk/PeerPhysicalPath.java b/java/src/com/zerotier/sdk/PeerPhysicalPath.java
index 3f9a86128..4aee98776 100644
--- a/java/src/com/zerotier/sdk/PeerPhysicalPath.java
+++ b/java/src/com/zerotier/sdk/PeerPhysicalPath.java
@@ -75,4 +75,4 @@ public final class PeerPhysicalPath {
     public final boolean isPreferred() {
         return preferred;
     }
-}
\ No newline at end of file
+}
diff --git a/java/src/com/zerotier/sdk/PeerRole.java b/java/src/com/zerotier/sdk/PeerRole.java
index fce183d9c..83cc7d1e6 100644
--- a/java/src/com/zerotier/sdk/PeerRole.java
+++ b/java/src/com/zerotier/sdk/PeerRole.java
@@ -28,6 +28,7 @@
 package com.zerotier.sdk;
 
 public enum PeerRole {
+
     /**
      * An ordinary node
      */
diff --git a/java/src/com/zerotier/sdk/ResultCode.java b/java/src/com/zerotier/sdk/ResultCode.java
index 09e7d3b13..7c80e5844 100644
--- a/java/src/com/zerotier/sdk/ResultCode.java
+++ b/java/src/com/zerotier/sdk/ResultCode.java
@@ -36,6 +36,7 @@ package com.zerotier.sdk;
  * problem.</p>
  */
 public enum ResultCode {
+
     /**
      * Operation completed normally
      */
@@ -76,4 +77,4 @@ public enum ResultCode {
     public boolean isFatal(int id) {
     	return (id > 100 && id < 1000);
     }
-}
\ No newline at end of file
+}
diff --git a/java/src/com/zerotier/sdk/VirtualNetworkConfigListener.java b/java/src/com/zerotier/sdk/VirtualNetworkConfigListener.java
index 15ae301cd..24229039e 100644
--- a/java/src/com/zerotier/sdk/VirtualNetworkConfigListener.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkConfigListener.java
@@ -25,11 +25,11 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-
 package com.zerotier.sdk;
 
 
 public interface VirtualNetworkConfigListener {
+
     /**
      * Callback called to update virtual network port configuration
      *
@@ -57,4 +57,4 @@ public interface VirtualNetworkConfigListener {
             long nwid,
             VirtualNetworkConfigOperation op,
             VirtualNetworkConfig config);
-}
\ No newline at end of file
+}
diff --git a/java/src/com/zerotier/sdk/VirtualNetworkConfigOperation.java b/java/src/com/zerotier/sdk/VirtualNetworkConfigOperation.java
index b70eb4786..6abf2755f 100644
--- a/java/src/com/zerotier/sdk/VirtualNetworkConfigOperation.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkConfigOperation.java
@@ -24,9 +24,11 @@
  * redistribute it in a modified binary form, please contact ZeroTier Networks
  * LLC. Start here: http://www.zerotier.com/
  */
+
 package com.zerotier.sdk;
 
 public enum VirtualNetworkConfigOperation {
+
     /**
      * Network is coming up (either for the first time or after service restart)
      */
diff --git a/java/src/com/zerotier/sdk/VirtualNetworkFrameListener.java b/java/src/com/zerotier/sdk/VirtualNetworkFrameListener.java
index 9ad322825..a1c676172 100644
--- a/java/src/com/zerotier/sdk/VirtualNetworkFrameListener.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkFrameListener.java
@@ -28,6 +28,7 @@
 package com.zerotier.sdk;
 
 public interface VirtualNetworkFrameListener {
+
     /**
      * Function to send a frame out to a virtual network port
      * 
diff --git a/java/src/com/zerotier/sdk/VirtualNetworkStatus.java b/java/src/com/zerotier/sdk/VirtualNetworkStatus.java
index 68e01bd61..f98aec4a5 100644
--- a/java/src/com/zerotier/sdk/VirtualNetworkStatus.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkStatus.java
@@ -24,9 +24,11 @@
  * redistribute it in a modified binary form, please contact ZeroTier Networks
  * LLC. Start here: http://www.zerotier.com/
  */
+
 package com.zerotier.sdk;
 
 public enum VirtualNetworkStatus {
+
     /**
      * Waiting for network configuration (also means revision == 0)
      */
diff --git a/java/src/com/zerotier/sdk/VirtualNetworkType.java b/java/src/com/zerotier/sdk/VirtualNetworkType.java
index ab1f4e087..0b55828eb 100644
--- a/java/src/com/zerotier/sdk/VirtualNetworkType.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkType.java
@@ -24,9 +24,11 @@
  * redistribute it in a modified binary form, please contact ZeroTier Networks
  * LLC. Start here: http://www.zerotier.com/
  */
+
 package com.zerotier.sdk;
 
 public enum VirtualNetworkType {
+
     /**
      * Private networks are authorized via certificates of membership
      */