diff --git a/.clang-format b/.clang-format
index 3caf6acd..d93d5ca3 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,7 +1,7 @@
 ---
 Language:        Cpp
 BasedOnStyle:    Google
-AccessModifierOffset: -4
+AccessModifierOffset: -3
 AlignAfterOpenBracket: AlwaysBreak
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
@@ -60,7 +60,7 @@ Cpp11BracedListStyle: true
 DeriveLineEnding: true
 DerivePointerAlignment: false
 DisableFormat:   false
-EmptyLineBeforeAccessModifier: Never
+EmptyLineBeforeAccessModifier: Always
 EmptyLineAfterAccessModifier: Never
 ExperimentalAutoDetectBinPacking: false
 IndentCaseLabels: true
@@ -111,7 +111,7 @@ SpaceBeforeParensOptions:
   AfterIfMacros:       false
 SpaceBeforeRangeBasedForLoopColon: true
 SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
+SpacesBeforeTrailingComments: 2
 SpacesInAngles:  false
 SpacesInContainerLiterals: false
 SpacesInCStyleCastParentheses: false
diff --git a/include/Vector2.hpp b/include/Vector2.hpp
index f635996c..d6dac0b4 100644
--- a/include/Vector2.hpp
+++ b/include/Vector2.hpp
@@ -66,16 +66,12 @@ class Vector2 : public ::Vector2 {
     /**
      * Add vector and float value
      */
-    Vector2 Add(float value) const {
-      return Vector2AddValue(*this, value);
-    }
+    Vector2 Add(float value) const { return Vector2AddValue(*this, value); }
 
     /**
      * Add vector and float value
      */
-    Vector2 operator+(float value) const {
-      return Vector2AddValue(*this, value);
-    }
+    Vector2 operator+(float value) const { return Vector2AddValue(*this, value); }
 
     /**
      * Add vector and float value
@@ -108,16 +104,12 @@ class Vector2 : public ::Vector2 {
     /**
      * Subtract vector by float value
      */
-    RLCPP_NODISCARD Vector2 Subtract(float value) const {
-      return Vector2SubtractValue(*this, value);
-    }
+    RLCPP_NODISCARD Vector2 Subtract(float value) const { return Vector2SubtractValue(*this, value); }
 
     /**
      * Subtract vector by float value
      */
-    Vector2 operator-(float value) const {
-      return Vector2SubtractValue(*this, value);
-    }
+    Vector2 operator-(float value) const { return Vector2SubtractValue(*this, value); }
 
     /**
      * Subtract vector by float value
diff --git a/include/Vector3.hpp b/include/Vector3.hpp
index f5e75420..164e6eaa 100644
--- a/include/Vector3.hpp
+++ b/include/Vector3.hpp
@@ -56,16 +56,12 @@ class Vector3 : public ::Vector3 {
     /**
      * Add vector and float value
      */
-    RLCPP_NODISCARD Vector3 Add(float value) const {
-      return Vector3AddValue(*this, value);
-    }
+    RLCPP_NODISCARD Vector3 Add(float value) const { return Vector3AddValue(*this, value); }
 
     /**
      * Add vector and float value
      */
-    Vector3 operator+(float value) const {
-      return Vector3AddValue(*this, value);
-    }
+    Vector3 operator+(float value) const { return Vector3AddValue(*this, value); }
 
     Vector3& operator+=(float value) {
         set(Vector3AddValue(*this, value));
@@ -92,16 +88,12 @@ class Vector3 : public ::Vector3 {
     /**
      * Subtract vector by float value
      */
-    RLCPP_NODISCARD Vector3 Subtract(float value) const {
-      return Vector3SubtractValue(*this, value);
-    }
+    RLCPP_NODISCARD Vector3 Subtract(float value) const { return Vector3SubtractValue(*this, value); }
 
     /**
      * Subtract vector by float value
      */
-    Vector3 operator-(float value) const {
-      return Vector3SubtractValue(*this, value);
-    }
+    Vector3 operator-(float value) const { return Vector3SubtractValue(*this, value); }
 
     Vector3& operator-=(float value) {
         set(Vector3SubtractValue(*this, value));
diff --git a/include/Vector4.hpp b/include/Vector4.hpp
index b48b2dd9..f4d87528 100644
--- a/include/Vector4.hpp
+++ b/include/Vector4.hpp
@@ -82,16 +82,12 @@ class Vector4 : public ::Vector4 {
     /**
      * Add vector and float value
      */
-    RLCPP_NODISCARD Vector4 Add(const float value) const {
-        return ::Vector4AddValue(*this, value);
-    }
+    RLCPP_NODISCARD Vector4 Add(const float value) const { return ::Vector4AddValue(*this, value); }
 
     /**
      * Add vector and float value
      */
-    Vector4 operator+(const float value) const {
-        return ::Vector4AddValue(*this, value);
-    }
+    Vector4 operator+(const float value) const { return ::Vector4AddValue(*this, value); }
 
     /**
      * Add vector and float value
@@ -126,16 +122,12 @@ class Vector4 : public ::Vector4 {
     /**
      * Subtract vector by float value
      */
-    RLCPP_NODISCARD Vector4 Subtract(const float value) const {
-        return ::Vector4SubtractValue(*this, value);
-    }
+    RLCPP_NODISCARD Vector4 Subtract(const float value) const { return ::Vector4SubtractValue(*this, value); }
 
     /**
      * Subtract vector by float value
      */
-    Vector4 operator-(const float value) const {
-        return ::Vector4SubtractValue(*this, value);
-    }
+    Vector4 operator-(const float value) const { return ::Vector4SubtractValue(*this, value); }
 
     /**
      * Subtract vector by float value
@@ -251,12 +243,14 @@ class Vector4 : public ::Vector4 {
      * Divide vector components by value
      */
     constexpr friend Vector4 operator/(const float lhs, const Vector4& rhs) {
+        // clang-format off
         return Vector4{
             lhs / rhs.x,
             lhs / rhs.y,
             lhs / rhs.z,
             lhs / rhs.w
         };
+        // clang-format on
     }
 
     RLCPP_NODISCARD float Length() const { return ::Vector4Length(*this); }