diff --git a/puma_motor_driver/.clang-format b/puma_motor_driver/.clang-format
index c92eaea..dfd63a8 100644
--- a/puma_motor_driver/.clang-format
+++ b/puma_motor_driver/.clang-format
@@ -3,8 +3,8 @@ BasedOnStyle: Google
 AccessModifierOffset: -2
 ConstructorInitializerIndentWidth: 2
 AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
+AlignConsecutiveAssignments: true
+AlignConsecutiveDeclarations: true
 AlignConsecutiveMacros: AcrossEmptyLines
 AlignEscapedNewlines:  LeftWithLastLine
 AlignTrailingComments: true
@@ -17,7 +17,7 @@ AlwaysBreakBeforeMultilineStrings: true
 BreakBeforeBinaryOperators: false
 BreakBeforeTernaryOperators: false
 BreakConstructorInitializersBeforeComma: true
-BinPackParameters: false
+BinPackParameters: OnePerLine
 ColumnLimit: 120
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 DerivePointerBinding: false