diff --git a/src/main/java/org/asamk/signal/json/JsonDataMessage.java b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
index 47cc49e9..2c9372a6 100644
--- a/src/main/java/org/asamk/signal/json/JsonDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
@@ -23,7 +23,7 @@ class JsonDataMessage {
     List<JsonAttachment> attachments;
     JsonGroupInfo groupInfo;
 
-    JsonDataMessage(SignalServiceDataMessage dataMessage, final Manager m) {
+    JsonDataMessage(SignalServiceDataMessage dataMessage, Manager m) {
         this.timestamp = dataMessage.getTimestamp();
         if (dataMessage.getGroupContext().isPresent()) {
             if (dataMessage.getGroupContext().get().getGroupV1().isPresent()) {
@@ -39,17 +39,10 @@ class JsonDataMessage {
         }
         this.expiresInSeconds = dataMessage.getExpiresInSeconds();
         if (dataMessage.getReaction().isPresent()) {
-            if(m == null){
-                System.out.println("ERROR, MANAGER NOT SET");
-            }
-            else {
-                this.reaction = new JsonReaction(dataMessage.getReaction().get(), m);
-            }
+            this.reaction = new JsonReaction(dataMessage.getReaction().get(), m);
         }
         if (dataMessage.getQuote().isPresent()) {
             this.quote = new JsonQuote(dataMessage.getQuote().get());
-        } else {
-            this.quote = null;
         }
         if (dataMessage.getMentions().isPresent()) {
             this.mentions = new ArrayList<>(dataMessage.getMentions().get().size());
diff --git a/src/main/java/org/asamk/signal/json/JsonMention.java b/src/main/java/org/asamk/signal/json/JsonMention.java
index 37a8aa48..0095a8a1 100644
--- a/src/main/java/org/asamk/signal/json/JsonMention.java
+++ b/src/main/java/org/asamk/signal/json/JsonMention.java
@@ -9,7 +9,7 @@ public class JsonMention {
     int start;
     int length;
 
-    JsonMention(SignalServiceDataMessage.Mention mention){
+    JsonMention(SignalServiceDataMessage.Mention mention) {
         this.uuid = mention.getUuid();
         this.start = mention.getStart();
         this.length = mention.getLength();
diff --git a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
index d92c50e5..4c1a1539 100644
--- a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
@@ -20,7 +20,7 @@ public class JsonMessageEnvelope {
     JsonReceiptMessage receiptMessage;
 
     public JsonMessageEnvelope(
-            SignalServiceEnvelope envelope, SignalServiceContent content, final Manager m
+            SignalServiceEnvelope envelope, SignalServiceContent content, Manager m
     ) {
         if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
             SignalServiceAddress source = envelope.getSourceAddress();
diff --git a/src/main/java/org/asamk/signal/json/JsonQuote.java b/src/main/java/org/asamk/signal/json/JsonQuote.java
index d09654fc..5cc48522 100644
--- a/src/main/java/org/asamk/signal/json/JsonQuote.java
+++ b/src/main/java/org/asamk/signal/json/JsonQuote.java
@@ -13,7 +13,7 @@ public class JsonQuote {
     String text;
     List<JsonAttachment> attachments;
 
-    JsonQuote(SignalServiceDataMessage.Quote quote){
+    JsonQuote(SignalServiceDataMessage.Quote quote) {
         this.id = quote.getId();
         this.author = quote.getAuthor().getLegacyIdentifier();
         this.text = quote.getText();
diff --git a/src/main/java/org/asamk/signal/json/JsonReaction.java b/src/main/java/org/asamk/signal/json/JsonReaction.java
index d479a57f..5e978fe0 100644
--- a/src/main/java/org/asamk/signal/json/JsonReaction.java
+++ b/src/main/java/org/asamk/signal/json/JsonReaction.java
@@ -10,7 +10,7 @@ public class JsonReaction {
     long targetSentTimestamp;
     boolean isRemove;
 
-    JsonReaction(Reaction reaction, final Manager m){
+    JsonReaction(Reaction reaction, Manager m) {
         this.emoji = reaction.getEmoji();
         this.targetAuthor = m.resolveSignalServiceAddress(reaction.getTargetAuthor()).getLegacyIdentifier();
         this.targetSentTimestamp = reaction.getTargetSentTimestamp();
diff --git a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
index 47b6aea6..7ea75bbd 100644
--- a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
@@ -8,7 +8,7 @@ class JsonSyncDataMessage extends JsonDataMessage {
 
     String destination;
 
-    JsonSyncDataMessage(SentTranscriptMessage transcriptMessage, final Manager m) {
+    JsonSyncDataMessage(SentTranscriptMessage transcriptMessage, Manager m) {
         super(transcriptMessage.getMessage(), m);
         if (transcriptMessage.getDestination().isPresent()) {
             this.destination = transcriptMessage.getDestination().get().getLegacyIdentifier();
diff --git a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
index 0fa38ab0..f29bc02e 100644
--- a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
@@ -22,7 +22,7 @@ class JsonSyncMessage {
     List<ReadMessage> readMessages;
     JsonSyncMessageType type;
 
-    JsonSyncMessage(SignalServiceSyncMessage syncMessage, final Manager m) {
+    JsonSyncMessage(SignalServiceSyncMessage syncMessage, Manager m) {
         if (syncMessage.getSent().isPresent()) {
             this.sentMessage = new JsonSyncDataMessage(syncMessage.getSent().get(), m);
         }