diff --git a/.clang-format b/.clang-format
index 7b752660..0aad12b2 100644
--- a/.clang-format
+++ b/.clang-format
@@ -16,7 +16,6 @@ IndentPPDirectives: AfterHash
 PackConstructorInitializers: Never
 
 # Mozilla-style overides
-IndentExternBlock: NoIndent # Requires "BreakBeforeBraces" set to "Custom"
 AllowShortFunctionsOnASingleLine: Inline
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
@@ -29,13 +28,4 @@ BreakBeforeBraces: Mozilla
 # function calls.
 ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ]
 
-# Penalties
-# This decides what order things should be done if a line is too long
-#PenaltyBreakAssignment: 10
-#PenaltyBreakBeforeFirstCallParameter: 30
-#PenaltyBreakComment: 10
-#PenaltyBreakString: 10
-#PenaltyExcessCharacter: 100
-#PenaltyReturnTypeOnItsOwnLine: 5
-
 SortIncludes: false
diff --git a/libautoscoper/src/gpu/cuda/.clang-format b/libautoscoper/src/gpu/cuda/cutil/.clang-format
similarity index 88%
rename from libautoscoper/src/gpu/cuda/.clang-format
rename to libautoscoper/src/gpu/cuda/cutil/.clang-format
index d02ae4ad..f172688c 100644
--- a/libautoscoper/src/gpu/cuda/.clang-format
+++ b/libautoscoper/src/gpu/cuda/cutil/.clang-format
@@ -1,6 +1,8 @@
 ---
 BasedOnStyle: InheritParentConfig
 
+IndentExternBlock: NoIndent # Requires "BreakBeforeBraces" set to "Custom"
+
 BreakBeforeBraces: Custom
 BraceWrapping:
   # Mozilla-style defaults