diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index d58f27b..05b5ae4 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -671,15 +671,21 @@ private:
                 currentLineLength = 0;
                 justAddedExtraNewline = true;
             }
-            if (config.dfmt_brace_style != BraceStyle.allman && currentIs(tok!"else"))
-                write(" ");
-            if (!peekIs(tok!",") && !peekIs(tok!")") && !peekIs(tok!";") && !peekIs(tok!"{"))
+            if (config.dfmt_brace_style == BraceStyle.otbs && peekIs(tok!"else"))
             {
+                write(" ");
                 index++;
-                newline();
             }
             else
-                index++;
+            {
+                if (!peekIs(tok!",") && !peekIs(tok!")") && !peekIs(tok!";") && !peekIs(tok!"{"))
+                {
+                    index++;
+                    newline();
+                }
+                else
+                    index++;
+            }
         }
     }
 
diff --git a/tests/otbs/issue0050.d.ref b/tests/otbs/issue0050.d.ref
index 821ac56..c6ac5f4 100644
--- a/tests/otbs/issue0050.d.ref
+++ b/tests/otbs/issue0050.d.ref
@@ -6,8 +6,7 @@ void fun() {
                     doStuff();
                 else
                     morestuff();
-            }
-            else
+            } else
                 doStuff();
 
     cast(structalign_t) 1;
diff --git a/tests/otbs/issue0051.d.ref b/tests/otbs/issue0051.d.ref
index 91b3eeb..f0de7de 100644
--- a/tests/otbs/issue0051.d.ref
+++ b/tests/otbs/issue0051.d.ref
@@ -1,7 +1,6 @@
 void f() {
     if (a) {
-    }
-    else // wat
+    } else // wat
     {
         if (!is_temp_arg_ref) {
             if (global.params.isOSX)
diff --git a/tests/otbs/issue0060.d.ref b/tests/otbs/issue0060.d.ref
index 30c78f7..65e25c3 100644
--- a/tests/otbs/issue0060.d.ref
+++ b/tests/otbs/issue0060.d.ref
@@ -1,6 +1,4 @@
 static if (a) {
-}
-else static if (b) {
-}
-else {
+} else static if (b) {
+} else {
 }
diff --git a/tests/otbs/issue0068.d.ref b/tests/otbs/issue0068.d.ref
index 13dfb9c..084f9cb 100644
--- a/tests/otbs/issue0068.d.ref
+++ b/tests/otbs/issue0068.d.ref
@@ -1,4 +1,3 @@
 version (all) {
-}
-else version (none) {
+} else version (none) {
 }
diff --git a/tests/otbs/issue0081.d.ref b/tests/otbs/issue0081.d.ref
index 505e276..532810f 100644
--- a/tests/otbs/issue0081.d.ref
+++ b/tests/otbs/issue0081.d.ref
@@ -1,10 +1,8 @@
 unittest {
     if (0)
         if (0) {
-        }
-        else if (0) {
-        }
-        else {
+        } else if (0) {
+        } else {
         }
     doSomething();
 }
diff --git a/tests/otbs/issue0086.d.ref b/tests/otbs/issue0086.d.ref
index b942c1e..3ff4c68 100644
--- a/tests/otbs/issue0086.d.ref
+++ b/tests/otbs/issue0086.d.ref
@@ -12,8 +12,7 @@ void indent() {
         foreach (i; 0 .. indentLevel + tempIndent) {
             currentLineLength += config.tabSize;
             output.put("\t");
-        }
-    else
+        } else
         foreach (i; 0 .. indentLevel + tempIndent)
             foreach (j; 0 .. config.indentSize) {
                 output.put(" ");
diff --git a/tests/otbs/issue0093.d.ref b/tests/otbs/issue0093.d.ref
index 7995fe4..4188bc2 100644
--- a/tests/otbs/issue0093.d.ref
+++ b/tests/otbs/issue0093.d.ref
@@ -1,8 +1,7 @@
 unittest {
     if (x) {
         version (none) {
-        }
-        else {
+        } else {
         }
     }
 }
diff --git a/tests/otbs/issue0096.d.ref b/tests/otbs/issue0096.d.ref
index cc346c0..441e7d9 100644
--- a/tests/otbs/issue0096.d.ref
+++ b/tests/otbs/issue0096.d.ref
@@ -8,7 +8,6 @@ version (Windows) {
 }
 version (Windows) {
     void func();
-}
-else {
+} else {
     void func();
 }
diff --git a/tests/otbs/issue0099.d.ref b/tests/otbs/issue0099.d.ref
index 8c4bd1d..b615aa9 100644
--- a/tests/otbs/issue0099.d.ref
+++ b/tests/otbs/issue0099.d.ref
@@ -9,8 +9,7 @@ unittest {
                 else {
                     excessivelyLongFunctionName(false);
                 }
-            }
-            else
+            } else
                 a();
     }
 }
diff --git a/tests/otbs/issue0169.d.ref b/tests/otbs/issue0169.d.ref
index a1acfcc..6d99247 100644
--- a/tests/otbs/issue0169.d.ref
+++ b/tests/otbs/issue0169.d.ref
@@ -3,8 +3,7 @@ unittest {
         if (true) // comment
         {
 
-        }
-        else {
+        } else {
 
         }
     }
diff --git a/tests/otbs/issue0186.d.ref b/tests/otbs/issue0186.d.ref
index 35c98e5..8711a7c 100644
--- a/tests/otbs/issue0186.d.ref
+++ b/tests/otbs/issue0186.d.ref
@@ -12,12 +12,10 @@ void main() {
             return true;
         }()) {
 
-        }
-        else {
+        } else {
 
         }
-    }
-    else {
+    } else {
 
     }
 }