diff --git a/libdino/src/service/file_manager.vala b/libdino/src/service/file_manager.vala
index 4763d721..6f8ccee4 100644
--- a/libdino/src/service/file_manager.vala
+++ b/libdino/src/service/file_manager.vala
@@ -16,7 +16,7 @@ public class FileManager : StreamInteractionModule, Object {
     private StreamInteractor stream_interactor;
     private Database db;
     private Gee.List<FileSender> file_senders = new ArrayList<FileSender>();
-    public Gee.List<IncommingFileProcessor> incomming_processors = new ArrayList<IncommingFileProcessor>();
+    public Gee.List<IncomingFileProcessor> incoming_processors = new ArrayList<IncomingFileProcessor>();
     private Gee.List<OutgoingFileProcessor> outgoing_processors = new ArrayList<OutgoingFileProcessor>();
 
     public static void start(StreamInteractor stream_interactor, Database db) {
@@ -116,7 +116,7 @@ public class FileManager : StreamInteractionModule, Object {
     }
 
     public void add_provider(FileProvider file_provider) {
-        file_provider.file_incoming.connect((file_transfer, conversation) => { handle_incomming_file.begin(file_provider, file_transfer, conversation); });
+        file_provider.file_incoming.connect((file_transfer, conversation) => { handle_incoming_file.begin(file_provider, file_transfer, conversation); });
     }
 
     public void add_sender(FileSender file_sender) {
@@ -126,8 +126,8 @@ public class FileManager : StreamInteractionModule, Object {
         });
     }
 
-    public void add_incomming_processor(IncommingFileProcessor processor) {
-        incomming_processors.add(processor);
+    public void add_incoming_processor(IncomingFileProcessor processor) {
+        incoming_processors.add(processor);
     }
 
     public void add_outgoing_processor(OutgoingFileProcessor processor) {
@@ -140,7 +140,7 @@ public class FileManager : StreamInteractionModule, Object {
         return file_transfer.direction == FileTransfer.DIRECTION_SENT || in_roster;
     }
 
-    private async void handle_incomming_file(FileProvider file_provider, FileTransfer file_transfer, Conversation conversation) {
+    private async void handle_incoming_file(FileProvider file_provider, FileTransfer file_transfer, Conversation conversation) {
         if (!is_sender_trustworthy(file_transfer, conversation)) return;
 
         if (file_transfer.size == -1) {
@@ -192,7 +192,7 @@ public interface FileSender : Object {
     public abstract void send_file(Conversation conversation, FileTransfer file_transfer);
 }
 
-public interface IncommingFileProcessor : Object {
+public interface IncomingFileProcessor : Object {
     public abstract bool can_process(FileTransfer file_transfer);
     public abstract void process(FileTransfer file_transfer);
 }
diff --git a/libdino/src/service/stream_interactor.vala b/libdino/src/service/stream_interactor.vala
index 2c8e1adc..ab4a4a93 100644
--- a/libdino/src/service/stream_interactor.vala
+++ b/libdino/src/service/stream_interactor.vala
@@ -77,7 +77,7 @@ public class ModuleIdentity<T> : Object {
     }
 
     public bool matches(StreamInteractionModule module) {
-        return module.id== id;
+        return module.id == id;
     }
 }
 
diff --git a/plugins/http-files/src/file_provider.vala b/plugins/http-files/src/file_provider.vala
index 06b20e92..b7d18e36 100644
--- a/plugins/http-files/src/file_provider.vala
+++ b/plugins/http-files/src/file_provider.vala
@@ -103,7 +103,7 @@ public class FileProvider : Dino.FileProvider, Object {
 
             file_transfer.input_stream = yield request.send_async(null);
 
-            foreach (IncommingFileProcessor processor in stream_interactor.get_module(FileManager.IDENTITY).incomming_processors) {
+            foreach (IncomingFileProcessor processor in stream_interactor.get_module(FileManager.IDENTITY).incoming_processors) {
                 if (processor.can_process(file_transfer)) {
                     processor.process(file_transfer);
                 }
diff --git a/plugins/omemo/src/stream_module.vala b/plugins/omemo/src/stream_module.vala
index 30f8c04c..555fd68a 100644
--- a/plugins/omemo/src/stream_module.vala
+++ b/plugins/omemo/src/stream_module.vala
@@ -1,6 +1,5 @@
 using Gee;
 using Xmpp;
-using Xmpp;
 using Xmpp.Xep;
 using Signal;
 
diff --git a/plugins/openpgp/src/in_file_processor.vala b/plugins/openpgp/src/in_file_processor.vala
index 568315f9..918f824a 100644
--- a/plugins/openpgp/src/in_file_processor.vala
+++ b/plugins/openpgp/src/in_file_processor.vala
@@ -2,7 +2,7 @@ using Dino.Entities;
 
 namespace Dino.Plugins.OpenPgp {
 
-public class InFileProcessor : IncommingFileProcessor, Object {
+public class InFileProcessor : IncomingFileProcessor, Object {
     public bool can_process(FileTransfer file_transfer) {
         return file_transfer.file_name.has_suffix("pgp") || file_transfer.mime_type == "application/pgp-encrypted";
     }
diff --git a/plugins/openpgp/src/plugin.vala b/plugins/openpgp/src/plugin.vala
index adf2ecc7..1d4f5203 100644
--- a/plugins/openpgp/src/plugin.vala
+++ b/plugins/openpgp/src/plugin.vala
@@ -30,7 +30,7 @@ public class Plugin : Plugins.RootInterface, Object {
 
         Manager.start(app.stream_interactor, db);
         app.stream_interactor.get_module(FileManager.IDENTITY).add_outgoing_processor(new OutFileProcessor(app.stream_interactor));
-        app.stream_interactor.get_module(FileManager.IDENTITY).add_incomming_processor(new InFileProcessor());
+        app.stream_interactor.get_module(FileManager.IDENTITY).add_incoming_processor(new InFileProcessor());
 
         internationalize(GETTEXT_PACKAGE, app.search_path_generator.get_locale_path(GETTEXT_PACKAGE, LOCALE_INSTALL_DIR));
     }
diff --git a/plugins/openpgp/src/stream_flag.vala b/plugins/openpgp/src/stream_flag.vala
index 8593fa9d..df598625 100644
--- a/plugins/openpgp/src/stream_flag.vala
+++ b/plugins/openpgp/src/stream_flag.vala
@@ -1,6 +1,5 @@
 using Gee;
 
-using Xmpp;
 using Xmpp;
 
 namespace Dino.Plugins.OpenPgp {
@@ -19,4 +18,4 @@ public class Flag : XmppStreamFlag {
     public override string get_id() { return IDENTITY.id; }
 }
 
-}
\ No newline at end of file
+}
diff --git a/xmpp-vala/src/module/iq/module.vala b/xmpp-vala/src/module/iq/module.vala
index 45ba9d09..47f6e764 100644
--- a/xmpp-vala/src/module/iq/module.vala
+++ b/xmpp-vala/src/module/iq/module.vala
@@ -67,8 +67,8 @@ namespace Xmpp.Iq {
                         }
                     }
                 } else {
-                    Iq.Stanza unaviable_error =  new Iq.Stanza.error(iq, new StanzaNode.build("service-unaviable", "urn:ietf:params:xml:ns:xmpp-stanzas").add_self_xmlns());
-                    send_iq(stream, unaviable_error);
+                    Iq.Stanza unavailable_error = new Iq.Stanza.error(iq, new StanzaNode.build("service-unavailable", "urn:ietf:params:xml:ns:xmpp-stanzas").add_self_xmlns());
+                    send_iq(stream, unavailable_error);
                 }
             }
         }
diff --git a/xmpp-vala/src/module/xep/0363_http_file_upload.vala b/xmpp-vala/src/module/xep/0363_http_file_upload.vala
index d2e2af2c..1d808ed1 100644
--- a/xmpp-vala/src/module/xep/0363_http_file_upload.vala
+++ b/xmpp-vala/src/module/xep/0363_http_file_upload.vala
@@ -1,5 +1,4 @@
 using Xmpp;
-using Xmpp;
 using Xmpp.Xep;
 
 namespace Xmpp.Xep.HttpFileUpload {