diff --git a/.clang-format b/.clang-format
index 5946d8f..ec22b36 100644
--- a/.clang-format
+++ b/.clang-format
@@ -51,9 +51,8 @@ BraceWrapping:
   IndentBraces:     false
   SplitEmptyFunction: true
   SplitEmptyRecord: true
-BreakBeforeBinaryOperators: true
-BreakBeforeInheritanceComma: false
-BreakBeforeTernaryOperators: false
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeTernaryOperators: true
 BreakStringLiterals: true
 ColumnLimit:     80
 CommentPragmas:  '^ IWYU pragma:'