diff --git a/.clang-format b/.clang-format
index 9bff84c..874e43d 100644
--- a/.clang-format
+++ b/.clang-format
@@ -6,5 +6,9 @@ ColumnLimit: 100
 ---
 Language: Cpp
 
+AllowShortFunctionsOnASingleLine: Inline
+
+IndentCaseLabels: false
+
 DerivePointerAlignment: false
 PointerAlignment: Left
\ No newline at end of file
diff --git a/.clang-tidy b/.clang-tidy
index e7df1db..0908ccb 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -3,20 +3,31 @@ Checks: '
   bugprone-*,
   clang-analyzer-*,
   clang-diagnostic-*,
-  cppcoreguidelines-*,
+  # cppcoreguidelines-*,
   google-*,
   llvm-*,
   misc-*,
   modernize-*,
   performance-*,
   readability-*,
+
+  -bugprone-easily-swappable-parameters,
+
+  -cppcoreguidelines-avoid-magic-numbers,
+  -cppcoreguidelines-pro-bounds-constant-array-index,
+
+  -google-objc-function-naming,
+  -google-readability-todo,
   
   -misc-no-recursion,
   -modernize-use-nodiscard,
   -modernize-use-trailing-return-type,
 
+  -performance-avoid-endl,
+
   -readability-else-after-return,
   -readability-identifier-length,
+  -readability-magic-numbers,
 '
 
 WarningsAsErrors: '*'