diff --git a/include/aidge/utils/Any.hpp b/include/aidge/utils/Any.hpp
index d7ff22de23763e399d23fd7abb9e28a7a85aff5c..0310c38ccd855f64c8485a114962738203f03ef5 100644
--- a/include/aidge/utils/Any.hpp
+++ b/include/aidge/utils/Any.hpp
@@ -110,7 +110,7 @@ public:
     template<typename T, typename VT = _Decay_if_not_any<T>, std::enable_if_t<std::is_copy_constructible<VT>::value, bool> = true>
     explicit _any(T&& value)
         : _M_manager(&Manager<VT>::manage),
-            _M_data(new VT{std::forward<T>(value)})
+          _M_data(new VT{std::forward<T>(value)})
     {}
 
     ~_any()
diff --git a/include/aidge/utils/CParameter.hpp b/include/aidge/utils/CParameter.hpp
index 9231a6f33ea599d9b416ec1774c4fe06e910eeee..7d60ed239ae58666833c4ce227aaf16542679036 100644
--- a/include/aidge/utils/CParameter.hpp
+++ b/include/aidge/utils/CParameter.hpp
@@ -14,6 +14,10 @@
 
 #include <map>
 #include <vector>
+#include <type_traits>
+#include <typeinfo>
+#include <assert.h>
+
 #include "aidge/utils/Any.hpp"
 
 
@@ -27,7 +31,7 @@ private:
     inline _ValueType& any_cast_ref(const _any& __any)
     {
         using _Up =  std::remove_cv_t<std::remove_reference_t<_ValueType>>;
-        assert((std::__or_<std::is_reference<_ValueType>, std::is_copy_constructible<_ValueType>>::value && "Template argument must be a reference or CopyConstructible type"));
+        assert(((std::is_reference<_ValueType>::value || std::is_copy_constructible<_ValueType>::value) && "Template argument must be a reference or CopyConstructible type"));
         assert((std::is_constructible<_ValueType, const _Up&>::value && "Template argument must be constructible from a const value."));
         assert(std::is_object<_Up>::value);
         assert(__any.type() == typeid(_Up));
@@ -93,14 +97,6 @@ public:
 private:
     std::map<std::string, std::size_t> m_Params; // { Param name : offset }
 
-    ///\brief Map to check type error
-    /* Note : i tried this : `std::map<std::string, std::type_info const *> mTypes;`
-    but looks like the type_ingo object was destroyed.
-    I am not a hugde fan of storing a string and making string comparison.
-    Maybe we can use a custom enum type (or is there a standard solution ?)
-    */
-    std::map<std::string, std::string> m_Types;
-
     ///\brief All raw pointers to parameters values concatenated. Use custom any class compatible with C++14.
     std::vector<_any> m_Buffer = {};
 };