diff --git a/include/pinocchio/algorithm/crba.hxx b/include/pinocchio/algorithm/crba.hxx
index dadd13ba9..203b0a046 100644
--- a/include/pinocchio/algorithm/crba.hxx
+++ b/include/pinocchio/algorithm/crba.hxx
@@ -63,8 +63,7 @@ namespace pinocchio
       typename JointModel,
       typename Scalar,
       int Options,
-      template<typename, int>
-      class JointCollectionTpl>
+      template<typename, int> class JointCollectionTpl>
     static inline void mimic_patch_CrbaWorldConventionBackwardStep(
       const JointModelBase<JointModel> &,
       const ModelTpl<Scalar, Options, JointCollectionTpl> &,
@@ -188,8 +187,7 @@ namespace pinocchio
       typename JointModel,
       typename Scalar,
       int Options,
-      template<typename, int>
-      class JointCollectionTpl>
+      template<typename, int> class JointCollectionTpl>
     static inline void mimic_patch_CrbaLocalConventionBackwardStep(
       const JointModelBase<JointModel> &,
       const ModelTpl<Scalar, Options, JointCollectionTpl> &,
diff --git a/include/pinocchio/multibody/joint/joint-basic-visitors.hpp b/include/pinocchio/multibody/joint/joint-basic-visitors.hpp
index 7cb2d0041..a70833836 100644
--- a/include/pinocchio/multibody/joint/joint-basic-visitors.hpp
+++ b/include/pinocchio/multibody/joint/joint-basic-visitors.hpp
@@ -482,8 +482,7 @@ namespace pinocchio
   template<
     typename Scalar,
     int Options,
-    template<typename S, int O>
-    class JointCollectionTpl,
+    template<typename S, int O> class JointCollectionTpl,
     typename ConfigVectorIn,
     typename ConfigVectorOut>
   void configVectorAffineTransform(
diff --git a/include/pinocchio/multibody/joint/joint-basic-visitors.hxx b/include/pinocchio/multibody/joint/joint-basic-visitors.hxx
index 61ba13f82..3fef515c5 100644
--- a/include/pinocchio/multibody/joint/joint-basic-visitors.hxx
+++ b/include/pinocchio/multibody/joint/joint-basic-visitors.hxx
@@ -1008,8 +1008,7 @@ namespace pinocchio
   template<
     typename Scalar,
     int Options,
-    template<typename S, int O>
-    class JointCollectionTpl,
+    template<typename S, int O> class JointCollectionTpl,
     typename ConfigVectorIn,
     typename ConfigVectorOut>
   void configVectorAffineTransform(
diff --git a/include/pinocchio/multibody/joint/joint-mimic.hpp b/include/pinocchio/multibody/joint/joint-mimic.hpp
index da977040e..3ad4f17f6 100644
--- a/include/pinocchio/multibody/joint/joint-mimic.hpp
+++ b/include/pinocchio/multibody/joint/joint-mimic.hpp
@@ -622,8 +622,7 @@ namespace pinocchio
     typename NewScalar,
     typename Scalar,
     int Options,
-    template<typename S, int O>
-    class JointCollectionTpl>
+    template<typename S, int O> class JointCollectionTpl>
   struct CastType<NewScalar, JointModelMimicTpl<Scalar, Options, JointCollectionTpl>>
   {
     typedef JointModelMimicTpl<NewScalar, Options, JointCollectionTpl> type;
diff --git a/include/pinocchio/serialization/joints-data.hpp b/include/pinocchio/serialization/joints-data.hpp
index 9cf657a6d..240629a1f 100644
--- a/include/pinocchio/serialization/joints-data.hpp
+++ b/include/pinocchio/serialization/joints-data.hpp
@@ -66,8 +66,7 @@ namespace boost
         class Archive,
         typename Scalar,
         int Options,
-        template<typename, int>
-        class JointCollection>
+        template<typename, int> class JointCollection>
       void serialize(
         Archive & ar,
         pinocchio::JointDataBase<pinocchio::JointDataMimicTpl<Scalar, Options, JointCollection>> &
@@ -264,8 +263,7 @@ namespace boost
       class Archive,
       typename Scalar,
       int Options,
-      template<typename, int>
-      typename JointCollection>
+      template<typename, int> typename JointCollection>
     void serialize(
       Archive & ar,
       pinocchio::JointDataMimicTpl<Scalar, Options, JointCollection> & joint,
diff --git a/include/pinocchio/serialization/joints-model.hpp b/include/pinocchio/serialization/joints-model.hpp
index 45fec54d5..76e452d70 100644
--- a/include/pinocchio/serialization/joints-model.hpp
+++ b/include/pinocchio/serialization/joints-model.hpp
@@ -325,8 +325,7 @@ namespace boost
       class Archive,
       typename Scalar,
       int Options,
-      template<typename S, int O>
-      class JointCollectionTpl>
+      template<typename S, int O> class JointCollectionTpl>
     void serialize(
       Archive & ar,
       pinocchio::JointModelMimicTpl<Scalar, Options, JointCollectionTpl> & joint,
diff --git a/unittest/joint-motion-subspace.cpp b/unittest/joint-motion-subspace.cpp
index 1a1a55b62..6c1c899d5 100644
--- a/unittest/joint-motion-subspace.cpp
+++ b/unittest/joint-motion-subspace.cpp
@@ -93,8 +93,7 @@ void test_nv_against_jmodel(
 template<
   typename Scalar,
   int Options,
-  template<typename, int>
-  class JointCollection,
+  template<typename, int> class JointCollection,
   typename ConstraintDerived>
 void test_nv_against_jmodel(
   const JointModelMimicTpl<Scalar, Options, JointCollection> & jmodel,