diff --git a/.clang-format b/.clang-format
index 465b025..659a859 100644
--- a/.clang-format
+++ b/.clang-format
@@ -21,17 +21,17 @@ AlwaysBreakTemplateDeclarations: true
 BinPackArguments: true
 BinPackParameters: false
 BraceWrapping:
-    AfterClass: true
-    AfterControlStatement: true
-    AfterEnum: true
-    AfterFunction: true
-    AfterNamespace: true
-    AfterObjCDeclaration: true
-    AfterStruct: true
-    AfterUnion: true
-    BeforeCatch: true
-    BeforeElse: true
-    IndentBraces: false
+  AfterClass: true
+  AfterControlStatement: true
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterObjCDeclaration: true
+  AfterStruct: true
+  AfterUnion: true
+  BeforeCatch: true
+  BeforeElse: true
+  IndentBraces: false
 BreakBeforeBinaryOperators: NonAssignment
 BreakBeforeBraces: Custom
 BreakBeforeTernaryOperators: true
@@ -39,7 +39,7 @@ BreakConstructorInitializers: BeforeColon
 BreakInheritanceList: BeforeColon
 #BreakStringLiterals
 ColumnLimit: 80
-CommentPragmas: ''
+CommentPragmas: ""
 CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 4
diff --git a/.clang-tidy b/.clang-tidy
index c5d55af..725ab31 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -5,29 +5,37 @@
 Checks: >
   *,
   -altera*,
+  -boost*,
   -fuchsia*,
   -llvmlibc*,
   -llvm-header-guard,
+  -llvm-prefer-static-over-anonymous-namespace,
+  -google-readability-todo,
   -misc-no-recursion,
+  -misc-include-cleaner,
+  -misc-const-correctness,
   -modernize-use-trailing-return-type,
+  -portability-avoid-pragma-once,
+  -readability-use-anyofallof,
   -readability-redundant-access-specifiers,
   -readability-convert-member-functions-to-static,
-  -cppcoreguidelines-avoid-const-or-ref-data-members
+  -cppcoreguidelines-avoid-const-or-ref-data-members,
+  -cppcoreguidelines-pro-bounds-constant-array-index
 
 CheckOptions:
-  - key:    misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
-    value:  '1'
+  - key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
+    value: "1"
   - key: readability-identifier-length.MinimumLoopCounterNameLength
     value: 1
   - key: readability-identifier-length.IgnoredVariableNames
-    value: '^[defijkptuvw]$'
+    value: "^[_defijkptuvwxyz]$"
   # More options here: https://clang.llvm.org/extra/clang-tidy/checks/readability/identifier-naming.html
   - key: readability-identifier-naming.NamespaceCase
     value: lower_case
   - key: readability-identifier-naming.ClassCase
-    value: CamelCase 
+    value: CamelCase
   - key: readability-identifier-naming.StructCase
-    value: CamelCase 
+    value: CamelCase
   - key: readability-identifier-naming.FunctionCase
     value: lower_case
   - key: readability-identifier-naming.VariableCase
@@ -51,14 +59,14 @@ CheckOptions:
   - key: readability-identifier-naming.GlobalFunctionCase
     value: lower_case
   - key: readability-identifier-naming.MemberConstantCase
-    value: CamelCase 
+    value: CamelCase
   - key: readability-identifier-naming.StaticConstantCase
-    value: lower_case 
+    value: lower_case
   - key: readability-function-cognitive-complexity.Threshold
     value: 10
+  - key: readability-function-cognitive-complexity.IgnoreMacros
+    value: true
   - key: readability-function-size.ParameterThreshold
     value: 4
-  - key: misc-include-cleaner.IgnoreHeaders
-    value:  utility;cstddef;geode/.*_export\.h;geode/.*/common\.h;geode/basic/types\.h;geode/basic/assert\.h;
-
-
+  - key: cppcoreguidelines-pro-type-member-init.IgnoreArrays
+    value: true
diff --git a/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp b/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp
index 41b81a6..6c5fe51 100644
--- a/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp
+++ b/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp
@@ -107,9 +107,7 @@ namespace geode
                     }
                     const auto polyhedra_around = mesh_.polyhedra_around_edge(
                         polyhedron_edge_vertices, polyhedron_id );
-                    if( !polyhedra_around_edge_are_the_same(
-                            mesh_.polyhedra_around_edge(
-                                polyhedron_edge_vertices, polyhedron_id ),
+                    if( !polyhedra_around_edge_are_the_same( polyhedra_around,
                             polyhedra_around_edges_.at( polyhedron_edge ) ) )
                     {
                         return false;