diff --git a/src/foundation/pEp/jniadapter/AbstractEngine.java b/src/foundation/pEp/jniadapter/AbstractEngine.java
index 9b14e52..e3af136 100644
--- a/src/foundation/pEp/jniadapter/AbstractEngine.java
+++ b/src/foundation/pEp/jniadapter/AbstractEngine.java
@@ -37,48 +37,52 @@ abstract class AbstractEngine extends UniquelyIdentifiable implements AbstractEn
         }
     }
 
-    private native String _getVersion();
-
     public String getVersion() {
         return _getVersion();
     }
 
-    private native String _getProtocolVersion();
+    private native String _getVersion();
+
 
     public String getProtocolVersion() {
         return _getProtocolVersion();
     }
 
-    private native void _startKeyserverLookup();
+    private native String _getProtocolVersion();
+
 
     public void startKeyserverLookup() {
         _startKeyserverLookup();
     }
 
-    private native void _stopKeyserverLookup();
+    private native void _startKeyserverLookup();
 
     public void stopKeyserverLookup() {
         _startKeyserverLookup();
     }
 
-    private native void _startSync();
+    private native void _stopKeyserverLookup();
+
 
     public void startSync() {
         _startSync();
     }
 
-    private native void _stopSync();
+    private native void _startSync();
 
     public void stopSync() {
         _stopSync();
     }
 
-    private native boolean _isSyncRunning();
+    private native void _stopSync();
 
     public boolean isSyncRunning() {
         return _isSyncRunning();
     }
 
+    private native boolean _isSyncRunning();
+
+    // Callbacks
     public void setMessageToSendCallback(Sync.MessageToSendCallback messageToSendCallback) {
         this.messageToSendCallback = messageToSendCallback;
     }
diff --git a/src/foundation/pEp/jniadapter/Blob.java b/src/foundation/pEp/jniadapter/Blob.java
index 9d2c7cc..073ac42 100644
--- a/src/foundation/pEp/jniadapter/Blob.java
+++ b/src/foundation/pEp/jniadapter/Blob.java
@@ -11,10 +11,18 @@ public class Blob implements BlobInterface, Serializable {
         mime_type = "application/octet-stream";
     }
 
-    /** Human readable string representation of Blob.
+    Blob(_Blob b) {
+        data = b.data;
+        mime_type = Utils.toUTF16(b.mime_type);
+        filename = Utils.toUTF16(b.filename);
+    }
+
+    /**
+     * Human readable string representation of Blob.
      * The data field is ASN.1 XER decoded for mime_types:
      * "application/pEp.sync"
      * "application/pEp.keyreset"
+     *
      * @return String Blob as String
      */
     public String toString() {
@@ -27,10 +35,5 @@ public class Blob implements BlobInterface, Serializable {
         return ret;
     }
 
-    Blob(_Blob b) {
-        data = b.data;
-        mime_type = Utils.toUTF16(b.mime_type);
-        filename = Utils.toUTF16(b.filename);
-    }
 }
 
diff --git a/src/foundation/pEp/jniadapter/Identity.java b/src/foundation/pEp/jniadapter/Identity.java
index 54ff7de..34e7dde 100644
--- a/src/foundation/pEp/jniadapter/Identity.java
+++ b/src/foundation/pEp/jniadapter/Identity.java
@@ -33,17 +33,16 @@ public class Identity implements IdentityInterface, Serializable {
         flags = i.flags;
     }
 
-    @Override
-    public String toString() {
-        return address + "::" + username + "\n" +
-                user_id + "::" + fpr;
+    public Rating getRating() {
+        return Rating.getByInt(_getRating(comm_type.value));
     }
 
-    // Native
     private native int _getRating(int commType);
 
-    public Rating getRating() {
-        return Rating.getByInt(_getRating(comm_type.value));
+    @Override
+    public String toString() {
+        return address + "::" + username + "\n" +
+                user_id + "::" + fpr;
     }
 
 }
diff --git a/src/foundation/pEp/jniadapter/Sync.java b/src/foundation/pEp/jniadapter/Sync.java
index 685ba0d..7889340 100644
--- a/src/foundation/pEp/jniadapter/Sync.java
+++ b/src/foundation/pEp/jniadapter/Sync.java
@@ -6,7 +6,7 @@ import foundation.pEp.jniadapter.pEpException;
 
 public interface Sync {
 
-     
+
     interface NeedsFastPollCallback {
         void needsFastPollCallFromC(Boolean fast_poll_needed);
     }
@@ -20,8 +20,7 @@ public interface Sync {
     }
 
 
-    public class DefaultCallback 
-            implements Sync.MessageToSendCallback, Sync.NotifyHandshakeCallback,  Sync.NeedsFastPollCallback {
+    public class DefaultCallback implements Sync.MessageToSendCallback, Sync.NotifyHandshakeCallback, Sync.NeedsFastPollCallback {
         @Override
         public void needsFastPollCallFromC(Boolean fast_poll_needed) {
             System.out.println("Need fast Poll");
@@ -31,7 +30,7 @@ public interface Sync {
         public void messageToSend(Message message) {
             System.out.println("messageToSend Defualt Callback");
         }
-        
+
         @Override
         public void notifyHandshake(Identity myself, Identity partner, SyncHandshakeSignal signal) {
             System.out.println("notifyHandshake Default Callback");