diff --git a/src/detect-tls.c b/src/detect-tls.c
index 2075494bd6..deeab3f1ec 100644
--- a/src/detect-tls.c
+++ b/src/detect-tls.c
@@ -290,8 +290,7 @@ static DetectTlsData *DetectTlsSubjectParse (char *str)
     }
 
     /* Let's see if we need to escape "'s */
-    if (tmp_str[0] == '"')
-    {
+    if (tmp_str[0] == '"') {
         tmp_str[strlen(tmp_str) - 1] = '\0';
         tmp_str += 1;
     }
@@ -531,7 +530,8 @@ static int DetectTlsIssuerDNSetup (DetectEngineCtx *de_ctx, Signature *s, char *
     SigMatch *sm = NULL;
 
     tls = DetectTlsIssuerDNParse(str);
-    if (tls == NULL) goto error;
+    if (tls == NULL)
+        goto error;
 
     /* Okay so far so good, lets get this into a SigMatch
      * and put it in the Signature. */
@@ -553,8 +553,10 @@ static int DetectTlsIssuerDNSetup (DetectEngineCtx *de_ctx, Signature *s, char *
     return 0;
 
 error:
-    if (tls != NULL) DetectTlsIssuerDNFree(tls);
-    if (sm != NULL) SCFree(sm);
+    if (tls != NULL)
+        DetectTlsIssuerDNFree(tls);
+    if (sm != NULL)
+        SCFree(sm);
     return -1;
 
 }
@@ -717,7 +719,8 @@ static int DetectTlsFingerprintSetup (DetectEngineCtx *de_ctx, Signature *s, cha
     SigMatch *sm = NULL;
 
     tls = DetectTlsFingerprintParse(str);
-    if (tls == NULL) goto error;
+    if (tls == NULL)
+        goto error;
 
     /* Okay so far so good, lets get this into a SigMatch
      * and put it in the Signature. */
@@ -739,8 +742,10 @@ static int DetectTlsFingerprintSetup (DetectEngineCtx *de_ctx, Signature *s, cha
     return 0;
 
 error:
-    if (tls != NULL) DetectTlsFingerprintFree(tls);
-    if (sm != NULL) SCFree(sm);
+    if (tls != NULL)
+        DetectTlsFingerprintFree(tls);
+    if (sm != NULL)
+        SCFree(sm);
     return -1;
 
 }
@@ -790,8 +795,9 @@ static int DetectTlsStoreSetup (DetectEngineCtx *de_ctx, Signature *s, char *str
     return 0;
 
 error:
-    if (sm != NULL) SCFree(sm);
-        return -1;
+    if (sm != NULL)
+        SCFree(sm);
+    return -1;
 
 }
 
diff --git a/src/log-tlslog.c b/src/log-tlslog.c
index a1c9072c65..3d808ea95e 100644
--- a/src/log-tlslog.c
+++ b/src/log-tlslog.c
@@ -535,7 +535,6 @@ OutputCtx *LogTlsLogInitCtx(ConfNode *conf)
         }
     }
 
-    /* FIXME config variable here */
     if (SCConfLogOpenGeneric(conf, file_ctx, DEFAULT_LOG_FILENAME) < 0) {
         LogFileFreeCtx(file_ctx);
         return NULL;