diff --git a/include/eigenpy/optional.hpp b/include/eigenpy/optional.hpp
index 949b8419e32d8d32cad6e5525eef069bdc379a41..8394ba7244ad43c5f548a241979338f24fafa8af 100644
--- a/include/eigenpy/optional.hpp
+++ b/include/eigenpy/optional.hpp
@@ -26,8 +26,8 @@ struct expected_pytype_for_arg<boost::optional<T> >
 
 #ifdef EIGENPY_WITH_CXX17_SUPPORT
 template <typename T>
-struct expected_pytype_for_arg<std::optional<T> >
-    : expected_pytype_for_arg<T> {};
+struct expected_pytype_for_arg<std::optional<T> > : expected_pytype_for_arg<T> {
+};
 #endif
 
 }  // namespace converter
@@ -37,18 +37,19 @@ struct expected_pytype_for_arg<std::optional<T> >
 namespace eigenpy {
 namespace detail {
 
-/// Helper struct to decide which type is the "none" type for a specific optional<T> implementation.
-template<template <typename> class OptionalTpl>
+/// Helper struct to decide which type is the "none" type for a specific
+/// optional<T> implementation.
+template <template <typename> class OptionalTpl>
 struct nullopt_helper {};
 
-template<>
+template <>
 struct nullopt_helper<boost::optional> {
   typedef boost::none_t type;
   static type value() { return boost::none; }
 };
 
 #ifdef EIGENPY_WITH_CXX17_SUPPORT
-template<>
+template <>
 struct nullopt_helper<std::optional> {
   typedef std::nullopt_t type;
   static type value() { return std::nullopt; }
diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
index 7b171d71b4c33d0f24cbc239039f548a8613759e..9736ded071268fcf0453927f8d55d9fc69c96945 100644
--- a/unittest/CMakeLists.txt
+++ b/unittest/CMakeLists.txt
@@ -46,9 +46,13 @@ function(config_bind_optional tagname opttype)
   configure_file(bind_optional.cpp.in ${MODNAME}.cpp)
 
   set(py_file test_optional_${tagname}.py)
-  configure_file(python/test_optional.py.in ${CMAKE_CURRENT_SOURCE_DIR}/python/${py_file})
+  configure_file(python/test_optional.py.in
+                 ${CMAKE_CURRENT_SOURCE_DIR}/python/${py_file})
   add_lib_unit_test(${MODNAME})
-  message(STATUS "Adding unit test py-optional-${tagname} with file ${py_file} and module ${MODNAME}")
+  message(
+    STATUS
+      "Adding unit test py-optional-${tagname} with file ${py_file} and module ${MODNAME}"
+  )
   add_python_unit_test("py-optional-${tagname}" "unittest/python/${py_file}"
                        "unittest")
 endfunction()