diff --git a/.clang-format b/.clang-format
index 53bf0b2606..9b9de47e7c 100644
--- a/.clang-format
+++ b/.clang-format
@@ -8,12 +8,12 @@ IndentWidth: 2
 Language: Cpp
 AccessModifierOffset: -2
 AllowShortBlocksOnASingleLine: false
-AllowShortFunctionsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: true
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
 BreakBeforeBraces: Allman
 BreakConstructorInitializersBeforeComma: false
 ColumnLimit: 100
 DerivePointerAlignment: false
-NamespaceIndentation: All
+NamespaceIndentation: None
 PointerAlignment: Middle