diff --git a/.clang-tidy b/.clang-tidy
index 8f07838..92713b6 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,6 +1,7 @@
 Checks: '
     -*,
     bugprone-*,
+    -bugprone-assignment-in-if-condition,
     -bugprone-branch-clone,
     -bugprone-easily-swappable-parameters,
     -bugprone-implicit-widening-of-multiplication-result,
@@ -16,6 +17,7 @@ Checks: '
     -google-runtime-int,
     -google-runtime-references,
     misc-*,
+    -misc-const-correctness,
     -misc-no-recursion,
     -misc-redundant-expression,
     -misc-unused-parameters,
@@ -23,6 +25,7 @@ Checks: '
     -modernize-avoid-c-arrays,
     -modernize-deprecated-headers,
     -modernize-loop-convert,
+    -modernize-raw-string-literal,
     -modernize-return-braced-init-list,
     -modernize-use-auto,
     -modernize-use-nullptr,
@@ -35,9 +38,11 @@ Checks: '
     -readability-else-after-return,
     -readability-function-cognitive-complexity,
     -readability-function-size,
+    -readability-identifier-length,
     -readability-implicit-bool-conversion,
     -readability-inconsistent-declaration-parameter-name,
     -readability-isolate-declaration,
     -readability-magic-numbers,
     -readability-named-parameter,
-    -readability-simplify-boolean-expr'
+    -readability-simplify-boolean-expr,
+    -readability-suspicious-call-argument'
diff --git a/src/fdcache_fdinfo.cpp b/src/fdcache_fdinfo.cpp
index b8ad2d4..c006358 100644
--- a/src/fdcache_fdinfo.cpp
+++ b/src/fdcache_fdinfo.cpp
@@ -49,9 +49,7 @@ void* PseudoFdInfo::MultipartUploadThreadWorker(void* arg)
 {
     pseudofdinfo_thparam*   pthparam = static_cast<pseudofdinfo_thparam*>(arg);
     if(!pthparam || !(pthparam->ppseudofdinfo)){
-        if(pthparam){
-            delete pthparam;
-        }
+        delete pthparam;
         return reinterpret_cast<void*>(-EIO);
     }
     S3FS_PRN_INFO3("Upload Part Thread [tpath=%s][start=%lld][size=%lld][part=%d]", pthparam->path.c_str(), static_cast<long long>(pthparam->start), static_cast<long long>(pthparam->size), pthparam->part_num);
diff --git a/src/fdcache_pseudofd.cpp b/src/fdcache_pseudofd.cpp
index 459257d..8a15d3e 100644
--- a/src/fdcache_pseudofd.cpp
+++ b/src/fdcache_pseudofd.cpp
@@ -33,7 +33,7 @@
 // The minimum pseudo fd value starts 2.
 // This is to avoid mistakes for 0(stdout) and 1(stderr), which are usually used.
 //
-#define MIN_PSEUDOFD_NUMBER     2
+static const int MIN_PSEUDOFD_NUMBER = 2;
 
 //------------------------------------------------
 // PseudoFdManager class methods