diff --git a/.clang-tidy b/.clang-tidy
index c17204eae..c70b40d30 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -18,8 +18,15 @@ Checks:          '*,
                     -google-readability-todo, 
                     -google-readability-braces-around-statements'
 
-WarningsAsErrors: '*'
-HeaderFilterRegex: '.*'
+HeaderFilterRegex: \.h
 AnalyzeTemporaryDtors: false
 FormatStyle:     none
+CheckOptions:
+  - { key: readability-identifier-naming.NamespaceCase,       value: lower_case }
+  - { key: readability-identifier-naming.FunctionCase,        value: lower_case }
+  - { key: readability-identifier-naming.ClassCase,           value: CamelCase  }
+  - { key: readability-identifier-naming.MethodCase,          value: CamelCase  }
+  - { key: readability-identifier-naming.StructCase,          value: CamelCase  }
+  - { key: readability-identifier-naming.VariableCase,        value: lower_case }
+  - { key: readability-identifier-naming.GlobalConstantCase,  value: UPPER_CASE }
 ...
diff --git a/slsDetectorSoftware/src/slsDetector.cpp b/slsDetectorSoftware/src/slsDetector.cpp
index c2820c38a..54117f8c7 100755
--- a/slsDetectorSoftware/src/slsDetector.cpp
+++ b/slsDetectorSoftware/src/slsDetector.cpp
@@ -1478,10 +1478,10 @@ int slsDetector::configureMAC() {
         ret = client.sendCommandThenRead(fnum, args, sizeof(args), retvals,
                                          sizeof(retvals));
 
+        //TODO!(Erik) Send as int already from detector
         uint64_t detector_mac = 0;
         uint32_t detector_ip = 0;
-        sscanf(retvals[0], "%lx",
-               &detector_mac); // TODO! (Erik) send mac and ip as int
+        sscanf(retvals[0], "%lx", &detector_mac);
         sscanf(retvals[1], "%x", &detector_ip);
         detector_ip = __builtin_bswap32(detector_ip);