 +};
  
  template<typename Type>
--constexpr const char* number = real<util::is_integral_v<Type>>;
+-constexpr const char* number =
+-    real<util::is_integral_v<Type>>;
 +struct number {
 +    static constexpr const char* value = real<std::is_integral<Type>::value>::value;
 +};
  
  template<typename Type>
--constexpr const char* number<std::complex<Type>> = complex<util::is_integral_v<Type>>;
+-constexpr const char* number<std::complex<Type>> =
+-    complex<util::is_integral_v<Type>>;
 +struct number<std::complex<Type>> {
 +    static constexpr const char* value = complex<std::is_integral<Type>::value>::value;
 +};
  
- constexpr const char name[] = R"(^[A-Za-z_]+[A-Za-z_\d]*$)";
- 
-@@ -454,13 +466,13 @@ public:
+ 
+ constexpr const char name[] =
+@@ -446,13 +456,13 @@ public:
  template<typename Type>
  Lexer<Type> make_lexer() noexcept {
      using namespace defaults;

 
 
diff --git a/include/calculate/wrapper.hpp b/include/calculate/wrapper.hpp
index 67d867f..d9a2b41 100644
--- a/include/calculate/wrapper.hpp
+++ b/include/calculate/wrapper.hpp
@@ -83,7 +83,7 @@ class Wrapper {

     Symbol(Callable&& callable) : Wrapper{std::forward<Callable>(callable)} {}
 
diff --git a/include/calculate/util.hpp b/include/calculate/util.hpp
index 4aa07c9..c643775 100644
--- a/include/calculate/util.hpp
+++ b/include/calculate/util.hpp
@@ -22,22 +22,6 @@ namespace calculate {
