diff --git a/CSSLayout/CSSLayout.c b/CSSLayout/CSSLayout.c
index 770ad45e..48cd7c45 100644
--- a/CSSLayout/CSSLayout.c
+++ b/CSSLayout/CSSLayout.c
@@ -1497,25 +1497,27 @@ static void layoutNodeImpl(const CSSNodeRef node,
       remainingFreeSpace = 0;
     }
 
-    // Use justifyContent to figure out how to allocate the remaining space
-    // available in the main axis.
-    if (justifyContent != CSSJustifyFlexStart) {
-      if (justifyContent == CSSJustifyCenter) {
+    switch (justifyContent) {
+      case CSSJustifyCenter:
         leadingMainDim = remainingFreeSpace / 2;
-      } else if (justifyContent == CSSJustifyFlexEnd) {
+        break;
+      case CSSJustifyFlexEnd:
         leadingMainDim = remainingFreeSpace;
-      } else if (justifyContent == CSSJustifySpaceBetween) {
-        remainingFreeSpace = fmaxf(remainingFreeSpace, 0);
+        break;
+      case CSSJustifySpaceBetween:
         if (itemsOnLine > 1) {
-          betweenMainDim = remainingFreeSpace / (itemsOnLine - 1);
+          betweenMainDim = fmaxf(remainingFreeSpace, 0) / (itemsOnLine - 1);
         } else {
           betweenMainDim = 0;
         }
-      } else if (justifyContent == CSSJustifySpaceAround) {
+        break;
+      case CSSJustifySpaceAround:
         // Space on the edges is half of the space between elements
         betweenMainDim = remainingFreeSpace / itemsOnLine;
         leadingMainDim = betweenMainDim / 2;
-      }
+        break;
+      default:
+        break;
     }
 
     float mainDim = leadingPaddingAndBorderMain + leadingMainDim;
diff --git a/format.sh b/format.sh
index 817d7fa3..4fae7ff9 100755
--- a/format.sh
+++ b/format.sh
@@ -6,7 +6,7 @@ clang-format \
     AlignOperands: true, \
     AllowAllParametersOfDeclarationOnNextLine: false, \
     AllowShortBlocksOnASingleLine: false, \
-    AllowShortCaseLabelsOnASingleLine: true, \
+    AllowShortCaseLabelsOnASingleLine: false, \
     AllowShortFunctionsOnASingleLine: false, \
     AllowShortIfStatementsOnASingleLine: false, \
     AllowShortLoopsOnASingleLine: false, \