diff --git a/src/mkv/write.c b/src/mkv/write.c
index bb5ec481699eeb72e03b24664ec9f95bde5a6b6a..c29dd79ff08ee87b66cad1430dd10b167aaad400 100644
--- a/src/mkv/write.c
+++ b/src/mkv/write.c
@@ -72,12 +72,16 @@ mkvpropedit__(const char *const args[])
             return false;
         }
 
-        execv("/usr/bin/mkvpropedit", (char *const *) args);
+        execv(args[0], (char *const *) args);
         exit(EXIT_FAILURE);
-    } else if (pid < 0) {
+    }
+
+    else if (pid < 0) {
         fprintf(stderr, " ! metadata_write: failed to fork: %s\n", strerror(errno));
         return false;
-    } else {
+    }
+
+    else {
         do {
             if (waitpid(pid, &wstatus, WUNTRACED | WCONTINUED) == -1) {
                 fprintf(stderr, " ! metadata_write: Failed to wait children: %s\n",
@@ -121,12 +125,7 @@ kara_metadata_write(struct kara_metadata *mdt, const char *filename, const char
         goto error;
     }
 
-    // First command //
-    if (!mkvpropedit__(args1))
-        goto error;
-
-    // Second command //
-    if (!mkvpropedit__(args2))
+    if (!mkvpropedit__(args1) || !mkvpropedit__(args2))
         goto error;
 
     sta = true;
@@ -172,30 +171,8 @@ metadata_from_path(char *const mkvfile, struct kara_metadata *meta)
                               sub_str_vec, sub_str_vec_len);
 
     if (pcre_exec_ret < 0) {
-        // Error //
-        switch (pcre_exec_ret) {
-        case PCRE_ERROR_NOMATCH:
-            fprintf(stderr, " ! metadata_from_path: No pattern match for file %s\n", mkvfile);
-            goto error;
-        case PCRE_ERROR_NULL:
-            fprintf(stderr, " ! metadata_from_path: Something was null for file %s\n", mkvfile);
-            goto error;
-        case PCRE_ERROR_BADOPTION:
-            fprintf(stderr, " ! metadata_from_path: Bad option passed for file %s\n", mkvfile);
-            goto error;
-        case PCRE_ERROR_BADMAGIC:
-            fprintf(stderr, " ! metadata_from_path: Magic number bad for file %s\n", mkvfile);
-            goto error;
-        case PCRE_ERROR_UNKNOWN_NODE:
-            fprintf(stderr, " ! metadata_from_path: Something kooky for file %s\n", mkvfile);
-            goto error;
-        case PCRE_ERROR_NOMEMORY:
-            fprintf(stderr, " ! metadata_from_path: Ran out of memory for file %s\n", mkvfile);
-            goto error;
-        default:
-            fprintf(stderr, " ! metadata_from_path: Unknown error for file %s\n", mkvfile);
-            goto error;
-        }
+        fprintf(stderr, " ! metadata_from_path: PCRE error\n");
+        goto error;
     }
 
     if (pcre_exec_ret == 0) {
diff --git a/src/uri.c b/src/uri.c
index e75ae92a038eed89ad907525c94f85c76b76490f..68d34b210babb154e8c691d602f2e029a7121993 100644
--- a/src/uri.c
+++ b/src/uri.c
@@ -75,7 +75,9 @@ lkt_uri_from(struct lkt_uri_t *ret, char *const str)
 
         *(int *) ret->value = id;
         ret->_allocated = true;
-    } else {
+    }
+
+    else {
         ret->_allocated = false;
         ret->value = val;
     }
diff --git a/src/utils.c b/src/utils.c
index 9ca3644a143705028df4548cafbfa761faebf8a0..c01ce5a628ed3c640f8bf76051d1b31653defefe 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -6,10 +6,8 @@ uint32_t
 be_uint32_t(const uint8_t bytes[], size_t n)
 {
     uint32_t res = 0;
-
     for (size_t i = 0; i < n; i++)
         res = (res << 8u) | bytes[i];
-
     return res;
 }
 
@@ -17,10 +15,8 @@ uint64_t
 be_uint64_t(const uint8_t bytes[], size_t n)
 {
     uint64_t res = 0;
-
     for (size_t i = 0; i < n; i++)
         res = (res << 8u) | bytes[i];
-
     return res;
 }
 
@@ -111,11 +107,8 @@ get_stdin_line(const char *prompt, char *buf, size_t len)
 {
     if (prompt)
         fprintf(stdout, "%s", prompt);
-
     if (!fgets(buf, len, stdin))
         return 1;
-
     buf[len - 1] = 0u;
-
     return is_utf8(buf);
 }