diff --git a/.clang-format b/.clang-format
index ff0d292..e5530e6 100644
--- a/.clang-format
+++ b/.clang-format
@@ -8,7 +8,7 @@
 AlignEscapedNewlines: Right
 AlignOperands:  Align
 AlignTrailingComments:
-  Kind: Never
+  Kind: Always
   OverEmptyLines: 1
 AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortBlocksOnASingleLine: Empty
@@ -104,7 +104,7 @@
 PenaltyBreakString: 1000
 PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 60
+PenaltyReturnTypeOnItsOwnLine: 150
 PenaltyIndentedWhitespace: 1
 PointerAlignment: Left
 QualifierAlignment: Left