diff --git a/cpp/splinepy/py/py_spline_reader.hpp b/cpp/splinepy/py/py_spline_reader.hpp
index fad072af4..56642ea71 100644
--- a/cpp/splinepy/py/py_spline_reader.hpp
+++ b/cpp/splinepy/py/py_spline_reader.hpp
@@ -285,86 +285,86 @@ class SplineReader {
 
     // Find appropriate BSplines
     switch (para_dim) {
+    case 1:
+      switch (dim) {
       case 1:
-        switch (dim) {
-          case 1:
-            auto bsparser = BSplineParser<1, 1>();
-            p_splines.append(bsparser.BsplineToDict(bspline));
-            break;
-          case 2:
-            auto bsparser = BSplineParser<1, 2>();
-            p_splines.append(bsparser.BsplineToDict(bspline));
-            break;
-          case 3:
-            auto bsparser = BSplineParser<1, 3>();
-            p_splines.append(bsparser.BsplineToDict(bspline));
-            break;
-          case 4:
-            auto bsparser = BSplineParser<1, 4>();
-            p_splines.append(bsparser.BsplineToDict(bspline));
-            break;
-        }
+        auto bsparser = BSplineParser<1, 1>();
+        p_splines.append(bsparser.BsplineToDict(bspline));
         break;
       case 2:
-        switch (dim) {
-          case 1:
-            auto bsparser = BSplineParser<2, 1>();
-            p_splines.append(bsparser.BsplineToDict(bspline));
-            break;
-          case 2:
-            auto bsparser = BSplineParser<2, 2>();
-            p_splines.append(bsparser.BsplineToDict(bspline));
-            break;
-          case 3:
-            auto bsparser = BSplineParser<2, 3>();
-            p_splines.append(bsparser.BsplineToDict(bspline));
-            break;
-          case 4:
-            auto bsparser = BSplineParser<2, 4>();
-            p_splines.append(bsparser.BsplineToDict(bspline));
-            break;
-        }
+        auto bsparser = BSplineParser<1, 2>();
+        p_splines.append(bsparser.BsplineToDict(bspline));
         break;
       case 3:
-        switch (dim) {
-          case 1:
-            auto bsparser = BSplineParser<3, 1>();
-            p_splines.append(bsparser.BsplineToDict(bspline));
-            break;
-          case 2:
-            auto bsparser = BSplineParser<3, 2>();
-            p_splines.append(bsparser.BsplineToDict(bspline));
-            break;
-          case 3:
-            auto bsparser = BSplineParser<3, 3>();
-            p_splines.append(bsparser.BsplineToDict(bspline));
-            break;
-          case 4:
-            auto bsparser = BSplineParser<3, 4>();
-            p_splines.append(bsparser.BsplineToDict(bspline));
-            break;
-        }
+        auto bsparser = BSplineParser<1, 3>();
+        p_splines.append(bsparser.BsplineToDict(bspline));
         break;
       case 4:
-        switch (dim) {
-          case 1:
-            auto bsparser = BSplineParser<4, 1>();
-            p_splines.append(bsparser.BsplineToDict(bspline));
-            break;
-          case 2:
-            auto bsparser = BSplineParser<4, 2>();
-            p_splines.append(bsparser.BsplineToDict(bspline));
-            break;
-          case 3:
-            auto bsparser = BSplineParser<4, 3>();
-            p_splines.append(bsparser.BsplineToDict(bspline));
-            break;
-          case 4:
-            auto bsparser = BSplineParser<4, 4>();
-            p_splines.append(bsparser.BsplineToDict(bspline));
-            break;
-        }
+        auto bsparser = BSplineParser<1, 4>();
+        p_splines.append(bsparser.BsplineToDict(bspline));
         break;
+      }
+      break;
+    case 2:
+      switch (dim) {
+      case 1:
+        auto bsparser = BSplineParser<2, 1>();
+        p_splines.append(bsparser.BsplineToDict(bspline));
+        break;
+      case 2:
+        auto bsparser = BSplineParser<2, 2>();
+        p_splines.append(bsparser.BsplineToDict(bspline));
+        break;
+      case 3:
+        auto bsparser = BSplineParser<2, 3>();
+        p_splines.append(bsparser.BsplineToDict(bspline));
+        break;
+      case 4:
+        auto bsparser = BSplineParser<2, 4>();
+        p_splines.append(bsparser.BsplineToDict(bspline));
+        break;
+      }
+      break;
+    case 3:
+      switch (dim) {
+      case 1:
+        auto bsparser = BSplineParser<3, 1>();
+        p_splines.append(bsparser.BsplineToDict(bspline));
+        break;
+      case 2:
+        auto bsparser = BSplineParser<3, 2>();
+        p_splines.append(bsparser.BsplineToDict(bspline));
+        break;
+      case 3:
+        auto bsparser = BSplineParser<3, 3>();
+        p_splines.append(bsparser.BsplineToDict(bspline));
+        break;
+      case 4:
+        auto bsparser = BSplineParser<3, 4>();
+        p_splines.append(bsparser.BsplineToDict(bspline));
+        break;
+      }
+      break;
+    case 4:
+      switch (dim) {
+      case 1:
+        auto bsparser = BSplineParser<4, 1>();
+        p_splines.append(bsparser.BsplineToDict(bspline));
+        break;
+      case 2:
+        auto bsparser = BSplineParser<4, 2>();
+        p_splines.append(bsparser.BsplineToDict(bspline));
+        break;
+      case 3:
+        auto bsparser = BSplineParser<4, 3>();
+        p_splines.append(bsparser.BsplineToDict(bspline));
+        break;
+      case 4:
+        auto bsparser = BSplineParser<4, 4>();
+        p_splines.append(bsparser.BsplineToDict(bspline));
+        break;
+      }
+      break;
     }
   }
 
@@ -378,86 +378,86 @@ class SplineReader {
 
     // Find appropriate Nurbs
     switch (para_dim) {
+    case 1:
+      switch (dim) {
       case 1:
-        switch (dim) {
-          case 1:
-            auto nparser = NurbsParser<1, 1>();
-            p_splines.append(nparser.NurbsToDict(nurbs));
-            break;
-          case 2:
-            auto nparser = NurbsParser<1, 2>();
-            p_splines.append(nparser.NurbsToDict(nurbs));
-            break;
-          case 3:
-            auto nparser = NurbsParser<1, 3>();
-            p_splines.append(nparser.NurbsToDict(nurbs));
-            break;
-          case 4:
-            auto nparser = NurbsParser<1, 4>();
-            p_splines.append(nparser.NurbsToDict(nurbs));
-            break;
-        }
+        auto nparser = NurbsParser<1, 1>();
+        p_splines.append(nparser.NurbsToDict(nurbs));
         break;
       case 2:
-        switch (dim) {
-          case 1:
-            auto nparser = NurbsParser<2, 1>();
-            p_splines.append(nparser.NurbsToDict(nurbs));
-            break;
-          case 2:
-            auto nparser = NurbsParser<2, 2>();
-            p_splines.append(nparser.NurbsToDict(nurbs));
-            break;
-          case 3:
-            auto nparser = NurbsParser<2, 3>();
-            p_splines.append(nparser.NurbsToDict(nurbs));
-            break;
-          case 4:
-            auto nparser = NurbsParser<2, 4>();
-            p_splines.append(nparser.NurbsToDict(nurbs));
-            break;
-        }
+        auto nparser = NurbsParser<1, 2>();
+        p_splines.append(nparser.NurbsToDict(nurbs));
         break;
       case 3:
-        switch (dim) {
-          case 1:
-            auto nparser = NurbsParser<3, 1>();
-            p_splines.append(nparser.NurbsToDict(nurbs));
-            break;
-          case 2:
-            auto nparser = NurbsParser<3, 2>();
-            p_splines.append(nparser.NurbsToDict(nurbs));
-            break;
-          case 3:
-            auto nparser = NurbsParser<3, 3>();
-            p_splines.append(nparser.NurbsToDict(nurbs));
-            break;
-          case 4:
-            auto nparser = NurbsParser<3, 4>();
-            p_splines.append(nparser.NurbsToDict(nurbs));
-            break;
-        }
+        auto nparser = NurbsParser<1, 3>();
+        p_splines.append(nparser.NurbsToDict(nurbs));
         break;
       case 4:
-        switch (dim) {
-          case 1:
-            auto nparser = NurbsParser<4, 1>();
-            p_splines.append(nparser.NurbsToDict(nurbs));
-            break;
-          case 2:
-            auto nparser = NurbsParser<4, 2>();
-            p_splines.append(nparser.NurbsToDict(nurbs));
-            break;
-          case 3:
-            auto nparser = NurbsParser<4, 3>();
-            p_splines.append(nparser.NurbsToDict(nurbs));
-            break;
-          case 4:
-            auto nparser = NurbsParser<4, 4>();
-            p_splines.append(nparser.NurbsToDict(nurbs));
-            break;
-        }
+        auto nparser = NurbsParser<1, 4>();
+        p_splines.append(nparser.NurbsToDict(nurbs));
         break;
+      }
+      break;
+    case 2:
+      switch (dim) {
+      case 1:
+        auto nparser = NurbsParser<2, 1>();
+        p_splines.append(nparser.NurbsToDict(nurbs));
+        break;
+      case 2:
+        auto nparser = NurbsParser<2, 2>();
+        p_splines.append(nparser.NurbsToDict(nurbs));
+        break;
+      case 3:
+        auto nparser = NurbsParser<2, 3>();
+        p_splines.append(nparser.NurbsToDict(nurbs));
+        break;
+      case 4:
+        auto nparser = NurbsParser<2, 4>();
+        p_splines.append(nparser.NurbsToDict(nurbs));
+        break;
+      }
+      break;
+    case 3:
+      switch (dim) {
+      case 1:
+        auto nparser = NurbsParser<3, 1>();
+        p_splines.append(nparser.NurbsToDict(nurbs));
+        break;
+      case 2:
+        auto nparser = NurbsParser<3, 2>();
+        p_splines.append(nparser.NurbsToDict(nurbs));
+        break;
+      case 3:
+        auto nparser = NurbsParser<3, 3>();
+        p_splines.append(nparser.NurbsToDict(nurbs));
+        break;
+      case 4:
+        auto nparser = NurbsParser<3, 4>();
+        p_splines.append(nparser.NurbsToDict(nurbs));
+        break;
+      }
+      break;
+    case 4:
+      switch (dim) {
+      case 1:
+        auto nparser = NurbsParser<4, 1>();
+        p_splines.append(nparser.NurbsToDict(nurbs));
+        break;
+      case 2:
+        auto nparser = NurbsParser<4, 2>();
+        p_splines.append(nparser.NurbsToDict(nurbs));
+        break;
+      case 3:
+        auto nparser = NurbsParser<4, 3>();
+        p_splines.append(nparser.NurbsToDict(nurbs));
+        break;
+      case 4:
+        auto nparser = NurbsParser<4, 4>();
+        p_splines.append(nparser.NurbsToDict(nurbs));
+        break;
+      }
+      break;
     }
   }