diff --git a/.clang-tidy b/.clang-tidy
index 82cbcf35488ef3ad4d887083220f01afcac6dd65..1f9170cf09e97b0cedb41a0bd262d9e7d250ef69 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,9 +1,10 @@
 ---
 Checks: '*,
--*braces-around-statements,
--*implicit-bool-conversion,
--*magic-numbers,
--*named-parameter,
+-*-braces-around-statements,
+-*-convert-member-functions-to-static,
+-*-implicit-bool-conversion,
+-*-magic-numbers,
+-*-named-parameter,
 -clang-analyzer-alpha*,
 -cert-err58-cpp,
 -cert-err61-cpp,
@@ -16,10 +17,33 @@ Checks: '*,
 -cppcoreguidelines-pro-type-vararg,
 -fuchsia-default-arguments-calls,
 -fuchsia-overloaded-operator,
+-google-build-using-namespace,
 -google-default-arguments,
+-google-readability-todo,
 -google-runtime-int,
 -hicpp-vararg,
 -misc-throw-by-value-catch-by-reference,
+-modernize-loop-convert,
 -modernize-raw-string-literal,
 -modernize-use-trailing-return-type,
-'
\ No newline at end of file
+-modernize-use-using,
+-performance-unnecessary-value-param,
+
+-*-isolate-declaration,
+-*-member-init,
+-*-namespace-comment,
+-*-owning-memory,
+-*-simplify-boolean-expr,
+-*-special-member-function*,
+-*-static-definition-in-anonymous-namespace,
+-*-statically-constructed-objects,
+-*-use-auto,
+-bugprone-copy-constructor-init,
+-bugprone-narrowing-conversions,
+-bugprone-unhandled-self-assignment,
+-cert-oop54-cpp,
+-google-readability-casting,
+-modernize-loop-convert,
+-modernize-return-braced-init-list,
+-performance-unnecessary-value-param,
+'
diff --git a/Core/Aggregate/ParticleLayout.cpp b/Core/Aggregate/ParticleLayout.cpp
index d7810a90977ea8db48fbb5ca0bd578c465c8c982..db11297d9ad9d810241ce44593d4774444aa01cd 100644
--- a/Core/Aggregate/ParticleLayout.cpp
+++ b/Core/Aggregate/ParticleLayout.cpp
@@ -28,12 +28,10 @@ namespace
 //! which is the case for 2D functions.
 bool particleDensityIsProvidedByInterference(const IInterferenceFunction& iff)
 {
-    if (iff.getName() == "Interference2DLattice" || iff.getName() == "Interference2DParaCrystal"
+    return iff.getName() == "Interference2DLattice" || iff.getName() == "Interference2DParaCrystal"
         || iff.getName() == "Interference2DSuperLattice"
         || iff.getName() == "InterferenceFinite2DLattice"
-        || iff.getName() == "InterferenceHardDisk")
-        return true;
-    return false;
+        || iff.getName() == "InterferenceHardDisk";
 }
 } // namespace