diff --git a/CHANGELOG.md b/CHANGELOG.md
index 950e3299..4618cc32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,10 @@
 # Changelog
 
-## 2.0.5
+## 2.1.0
 
-*   Fixed typos in documentation
+*   Moved helper function such as `unit_cast` and `unit_with_common_ratio` to own file for easier maintenance
+*   Moved cross-unit-operations and `epsEqual` to a separate file for easier maintenance
+*   Rename `epsEqual()` to `eps_equals()` for consitency with naming scheme
 
 ## 2.0.4
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 90199632..f3dca3c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.12)
 
 project(
   "SI"
-  VERSION 2.0.5
+  VERSION 2.1.0
   DESCRIPTION
     "A header only c++ library that provides type safety and user defined literals for handling pyhsical values defined in the International System of Units."
   HOMEPAGE_URL "https://github.com/bernedom/SI"
diff --git a/include/SI/absorbed_dose.h b/include/SI/absorbed_dose.h
index 20cf35b8..efa0b231 100644
--- a/include/SI/absorbed_dose.h
+++ b/include/SI/absorbed_dose.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/acceleration.h b/include/SI/acceleration.h
index 13848f95..f3def17a 100644
--- a/include/SI/acceleration.h
+++ b/include/SI/acceleration.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/angle.h b/include/SI/angle.h
index f779233a..49412212 100644
--- a/include/SI/angle.h
+++ b/include/SI/angle.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/area.h b/include/SI/area.h
index 4897a0cf..a1d2ee58 100644
--- a/include/SI/area.h
+++ b/include/SI/area.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/astronomic.h b/include/SI/astronomic.h
index f15f6f4c..792217b1 100644
--- a/include/SI/astronomic.h
+++ b/include/SI/astronomic.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/catalytic_activity.h b/include/SI/catalytic_activity.h
index 1567fc98..58ea3035 100644
--- a/include/SI/catalytic_activity.h
+++ b/include/SI/catalytic_activity.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/detail/cross_unit_operations.h b/include/SI/detail/cross_unit_operations.h
new file mode 100644
index 00000000..cc531daf
--- /dev/null
+++ b/include/SI/detail/cross_unit_operations.h
@@ -0,0 +1,60 @@
+/**
+ * This file is part of "SI" version 2.1.0
+ * A header only c++ library that provides type safety and user defined literals
+ * for handling pyhsical values defined in the International System of
+ * Units
+ *
+ * https://github.com/bernedom/SI
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ **/
+#pragma once
+
+#include "detail.h"
+
+namespace SI::detail {
+// forward declaration
+template <char _symbol, typename _exponent, typename _type, typename _ratio>
+struct unit_t;
+
+/// divide a value of a certain unit with another value of a possibly
+/// different type resulting in a new type, the resulting exponent is
+/// specified by resulting unit using a variadic template to simplify usage of
+/// implementation the internal type of the result is the internal type of lhs
+template <template <typename...> typename _resulting_unit, typename _unit_lhs,
+          typename _unit_rhs>
+constexpr auto cross_unit_divide(const _unit_lhs &lhs, const _unit_rhs &rhs) {
+  // do not use for the same unit as this should result in decreasing the
+  // exponent
+  static_assert(!std::is_same<_unit_lhs, _unit_rhs>::value);
+  static_assert(is_unit_t_v<_unit_lhs>, "lhs parameter is a unit_t");
+  static_assert(is_unit_t_v<_unit_rhs>, "rhs parameter is a unit_t");
+
+  using resulting_ratio = typename std::ratio_divide<typename _unit_lhs::ratio,
+                                                     typename _unit_rhs::ratio>;
+  return _resulting_unit<typename _unit_lhs::internal_type, resulting_ratio>(
+      lhs.value() / rhs.value());
+}
+/// multiply a value of a unit witn another value of a possibly different
+/// value resulting in a value of a new type with exponent 1 the internal type
+/// of the result is the internal type of lhs
+/// @todo add function that works with variable exponent units and remove
+/// special typedefs for time
+
+template <template <typename...> typename _resulting_unit, typename _unit_lhs,
+          typename _unit_rhs>
+constexpr auto cross_unit_multiply(const _unit_lhs &lhs, const _unit_rhs &rhs) {
+  // do not use for the same unit as this should result in increasing the
+  // exponent
+  static_assert(!std::is_same<_unit_lhs, _unit_rhs>::value);
+  static_assert(is_unit_t_v<_unit_lhs>, "lhs parameter is a unit_t");
+  static_assert(is_unit_t_v<_unit_rhs>, "rhs parameter is a unit_t");
+  using resulting_ratio =
+      typename std::ratio_multiply<typename _unit_lhs::ratio,
+                                   typename _unit_rhs::ratio>;
+  return _resulting_unit<typename _unit_lhs::internal_type, resulting_ratio>(
+      lhs.value() * rhs.value());
+}
+
+} // namespace SI::detail
\ No newline at end of file
diff --git a/include/SI/detail/detail.h b/include/SI/detail/detail.h
index 9faaa18f..348b8792 100644
--- a/include/SI/detail/detail.h
+++ b/include/SI/detail/detail.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
@@ -13,11 +13,8 @@
 
 #include "number_parser.h"
 #include <cstdint>
-#include <limits>
 #include <numeric>
 #include <ratio>
-#include <stdexcept>
-#include <type_traits>
 
 /// Namespace containing implementation details for SI
 namespace SI::detail {
@@ -31,13 +28,7 @@ struct is_ratio<std::ratio<_num, _den>> : std::true_type {};
 template <typename _type>
 inline constexpr bool is_ratio_v = is_ratio<_type>::value;
 
-template <typename T, std::enable_if_t<std::is_floating_point_v<T>> * = nullptr>
-constexpr bool epsEqual(const T &lhs, const T &rhs) {
-
-  return (lhs - rhs) < std::numeric_limits<T>::epsilon() &&
-         (lhs - rhs) > -std::numeric_limits<T>::epsilon();
-  // return std::abs(lhs - rhs) < std::numeric_limits<T>::epsilon();
-}
+/// calculate gcd for rations
 template <typename _ratio_lhs, typename _ratio_rhs> struct ratio_gcd {
 private:
   using gcd_num = std::integral_constant<std::intmax_t,
@@ -53,4 +44,24 @@ template <typename _ratio_lhs, typename _ratio_rhs> struct ratio_gcd {
                                                _ratio_rhs::den>;
 };
 
+// forward declaration
+template <char _symbol, typename _exponent, typename _type, typename _ratio>
+struct unit_t;
+
+/// helper template to check if a type is a unit_t (false for all other
+/// types)
+template <typename _unit> struct is_unit_t : std::false_type {};
+
+/// template specialisation to check if a type is a unit_t (true if unit_t)
+template <char _symbol, typename _exponent, typename _ratio, typename _type>
+struct is_unit_t<const unit_t<_symbol, _exponent, _type, _ratio>>
+    : std::true_type {};
+
+/// non-const specialisation of check above
+template <char _symbol, typename _exponent, typename _ratio, typename _type>
+struct is_unit_t<unit_t<_symbol, _exponent, _type, _ratio>> : std::true_type {};
+
+template <typename _type>
+inline constexpr bool is_unit_t_v = is_unit_t<_type>::value;
+
 } // namespace SI::detail
diff --git a/include/SI/detail/eps_equal.h b/include/SI/detail/eps_equal.h
new file mode 100644
index 00000000..881f7f0c
--- /dev/null
+++ b/include/SI/detail/eps_equal.h
@@ -0,0 +1,28 @@
+/**
+ * This file is part of "SI" version 2.1.0
+ * A header only c++ library that provides type safety and user defined literals
+ * for handling pyhsical values defined in the International System of
+ * Units
+ *
+ * https://github.com/bernedom/SI
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ **/
+#pragma once
+
+#include <limits>
+#include <numeric>
+#include <type_traits>
+
+namespace SI::detail {
+
+template <typename T, std::enable_if_t<std::is_floating_point_v<T>> * = nullptr>
+constexpr bool eps_equals(const T &lhs, const T &rhs) {
+
+  return (lhs - rhs) < std::numeric_limits<T>::epsilon() &&
+         (lhs - rhs) > -std::numeric_limits<T>::epsilon();
+  // return std::abs(lhs - rhs) < std::numeric_limits<T>::epsilon();
+}
+
+} // namespace SI::detail
\ No newline at end of file
diff --git a/include/SI/detail/number_parser.h b/include/SI/detail/number_parser.h
index 416aebed..0baa1dda 100644
--- a/include/SI/detail/number_parser.h
+++ b/include/SI/detail/number_parser.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/detail/operator_helpers.h b/include/SI/detail/operator_helpers.h
index 5b41d4ae..4e578a59 100644
--- a/include/SI/detail/operator_helpers.h
+++ b/include/SI/detail/operator_helpers.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
@@ -11,6 +11,7 @@
  **/
 #pragma once
 
+#include "cross_unit_operations.h"
 #include "detail.h"
 
 #define BUILD_UNIT_FROM_DIVISON(RESULTING_UNIT_T, DIVIDEND_UNIT_T,             \
diff --git a/include/SI/detail/unit.h b/include/SI/detail/unit.h
index 903345ea..5ac79383 100644
--- a/include/SI/detail/unit.h
+++ b/include/SI/detail/unit.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
@@ -18,6 +18,8 @@
 #endif
 
 #include "detail.h"
+#include "eps_equal.h"
+#include "unit_cast.h"
 
 #include <ratio>
 #include <type_traits>
@@ -25,10 +27,6 @@
 /// Namespace containing all SI units
 namespace SI::detail {
 
-// forward declarations
-template <typename _target_type, typename _rhs_T>
-constexpr auto unit_cast(const _rhs_T &rhs);
-
 template <typename _unit_lhs, typename _unit_rhs> struct unit_with_common_ratio;
 
 /// @todo add in-place unit_cast for move operators
@@ -168,8 +166,8 @@ struct unit_t {
       return unit_cast<gcd_unit>(rhs).value() ==
              unit_cast<gcd_unit>(*this).value();
     } else {
-      return detail::epsEqual(unit_cast<gcd_unit>(rhs).value(),
-                              unit_cast<gcd_unit>(*this).value());
+      return detail::eps_equals(unit_cast<gcd_unit>(rhs).value(),
+                                unit_cast<gcd_unit>(*this).value());
     }
   }
 
@@ -499,91 +497,4 @@ operator/(const _type &lhs,
                                             static_cast<_type>(_ratio::den)))});
 }
 
-/// helper template to check if a type is a unit_t (false for all other types)
-template <typename _unit> struct is_unit_t : std::false_type {};
-
-/// template specialisation to check if a type is a unit_t (true if unit_t)
-template <char _symbol, typename _exponent, typename _ratio, typename _type>
-struct is_unit_t<const unit_t<_symbol, _exponent, _type, _ratio>>
-    : std::true_type {};
-
-/// non-const specialisation of check above
-template <char _symbol, typename _exponent, typename _ratio, typename _type>
-struct is_unit_t<unit_t<_symbol, _exponent, _type, _ratio>> : std::true_type {};
-
-template <typename _type>
-inline constexpr bool is_unit_t_v = is_unit_t<_type>::value;
-
-/// function to cast between two units of the same type
-template <typename _target_type, typename _rhs_T>
-constexpr auto unit_cast(const _rhs_T &rhs) {
-  // using static assert instead of std::enable if in order to be able to
-  // forward declare this function easier
-  static_assert(
-      is_unit_t_v<_rhs_T> ||
-          std::is_base_of<
-              unit_t<_rhs_T::symbol::value, typename _rhs_T::exponent,
-                     typename _rhs_T::internal_type, typename _rhs_T::ratio>,
-              _rhs_T>::value,
-      "is of type unit_t or a derived class");
-  using conversion_ratio =
-      std::ratio_divide<typename _rhs_T::ratio, typename _target_type::ratio>;
-
-  return _target_type(
-      ((rhs.value() * conversion_ratio::num) / conversion_ratio::den));
-}
-
-template <typename _unit_lhs, typename _unit_rhs>
-struct unit_with_common_ratio {
-  static_assert(is_unit_t_v<_unit_lhs>, "only supported for SI::unit_t");
-  static_assert(is_unit_t_v<_unit_rhs>, "only supported for SI::unit_t");
-  static_assert(std::is_convertible<typename _unit_lhs::internal_type,
-                                    typename _unit_rhs::internal_type>::value);
-  static_assert(_unit_lhs::symbol::value == _unit_rhs::symbol::value);
-  using type =
-      unit_t<_unit_lhs::symbol::value, typename _unit_lhs::exponent,
-             typename _unit_lhs::internal_type,
-             typename detail::ratio_gcd<typename _unit_lhs::ratio,
-                                        typename _unit_rhs::ratio>::ratio>;
-};
-
-/// divide a value of a certain unit with another value of a possibly
-/// different type resulting in a new type, the resulting exponent is
-/// specified by resulting unit using a variadic template to simplify usage of
-/// implementation the internal type of the result is the internal type of lhs
-template <template <typename...> typename _resulting_unit, typename _unit_lhs,
-          typename _unit_rhs>
-constexpr auto cross_unit_divide(const _unit_lhs &lhs, const _unit_rhs &rhs) {
-  // do not use for the same unit as this should result in decreasing the
-  // exponent
-  static_assert(!std::is_same<_unit_lhs, _unit_rhs>::value);
-  static_assert(is_unit_t_v<_unit_lhs>, "lhs parameter is a unit_t");
-  static_assert(is_unit_t_v<_unit_rhs>, "rhs parameter is a unit_t");
-
-  using resulting_ratio = typename std::ratio_divide<typename _unit_lhs::ratio,
-                                                     typename _unit_rhs::ratio>;
-  return _resulting_unit<typename _unit_lhs::internal_type, resulting_ratio>(
-      lhs.value() / rhs.value());
-}
-/// multiply a value of a unit witn another value of a possibly different
-/// value resulting in a value of a new type with exponent 1 the internal type
-/// of the result is the internal type of lhs
-/// @todo add function that works with variable exponent units and remove
-/// special typedefs for time
-
-template <template <typename...> typename _resulting_unit, typename _unit_lhs,
-          typename _unit_rhs>
-constexpr auto cross_unit_multiply(const _unit_lhs &lhs, const _unit_rhs &rhs) {
-  // do not use for the same unit as this should result in increasing the
-  // exponent
-  static_assert(!std::is_same<_unit_lhs, _unit_rhs>::value);
-  static_assert(is_unit_t_v<_unit_lhs>, "lhs parameter is a unit_t");
-  static_assert(is_unit_t_v<_unit_rhs>, "rhs parameter is a unit_t");
-  using resulting_ratio =
-      typename std::ratio_multiply<typename _unit_lhs::ratio,
-                                   typename _unit_rhs::ratio>;
-  return _resulting_unit<typename _unit_lhs::internal_type, resulting_ratio>(
-      lhs.value() * rhs.value());
-}
-
 } // namespace SI::detail
diff --git a/include/SI/detail/unit_cast.h b/include/SI/detail/unit_cast.h
new file mode 100644
index 00000000..8f0b7ca5
--- /dev/null
+++ b/include/SI/detail/unit_cast.h
@@ -0,0 +1,52 @@
+/**
+ * This file is part of "SI" version 2.1.0
+ * A header only c++ library that provides type safety and user defined literals
+ * for handling pyhsical values defined in the International System of
+ * Units
+ *
+ * https://github.com/bernedom/SI
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ **/
+#pragma once
+
+#include "detail.h"
+#include <ratio>
+
+namespace SI::detail {
+
+/// function to cast between two units of the same type
+template <typename _target_type, typename _rhs_T>
+constexpr auto unit_cast(const _rhs_T &rhs) {
+  // using static assert instead of std::enable if in order to be able to
+  // forward declare this function easier
+  static_assert(
+      is_unit_t_v<_rhs_T> ||
+          std::is_base_of<
+              unit_t<_rhs_T::symbol::value, typename _rhs_T::exponent,
+                     typename _rhs_T::internal_type, typename _rhs_T::ratio>,
+              _rhs_T>::value,
+      "is of type unit_t or a derived class");
+  using conversion_ratio =
+      std::ratio_divide<typename _rhs_T::ratio, typename _target_type::ratio>;
+
+  return _target_type(
+      ((rhs.value() * conversion_ratio::num) / conversion_ratio::den));
+}
+
+template <typename _unit_lhs, typename _unit_rhs>
+struct unit_with_common_ratio {
+  static_assert(is_unit_t_v<_unit_lhs>, "only supported for SI::unit_t");
+  static_assert(is_unit_t_v<_unit_rhs>, "only supported for SI::unit_t");
+  static_assert(std::is_convertible<typename _unit_lhs::internal_type,
+                                    typename _unit_rhs::internal_type>::value);
+  static_assert(_unit_lhs::symbol::value == _unit_rhs::symbol::value);
+  using type =
+      unit_t<_unit_lhs::symbol::value, typename _unit_lhs::exponent,
+             typename _unit_lhs::internal_type,
+             typename detail::ratio_gcd<typename _unit_lhs::ratio,
+                                        typename _unit_rhs::ratio>::ratio>;
+};
+
+} // namespace SI::detail
\ No newline at end of file
diff --git a/include/SI/detail/unit_symbol.h b/include/SI/detail/unit_symbol.h
index 3f37bbbb..2a7cbc96 100644
--- a/include/SI/detail/unit_symbol.h
+++ b/include/SI/detail/unit_symbol.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/electric_capacity.h b/include/SI/electric_capacity.h
index 47fd8dd0..19d53de1 100644
--- a/include/SI/electric_capacity.h
+++ b/include/SI/electric_capacity.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/electric_charge.h b/include/SI/electric_charge.h
index 57f1e0c4..cae6dbc8 100644
--- a/include/SI/electric_charge.h
+++ b/include/SI/electric_charge.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/electric_conductance.h b/include/SI/electric_conductance.h
index bf9f4ac5..b205c674 100644
--- a/include/SI/electric_conductance.h
+++ b/include/SI/electric_conductance.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/electric_current.h b/include/SI/electric_current.h
index cf07c7ba..ca24996e 100644
--- a/include/SI/electric_current.h
+++ b/include/SI/electric_current.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/electric_potential.h b/include/SI/electric_potential.h
index a82cb0df..a2863b16 100644
--- a/include/SI/electric_potential.h
+++ b/include/SI/electric_potential.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/electric_resistance.h b/include/SI/electric_resistance.h
index 608cea37..e01e1721 100644
--- a/include/SI/electric_resistance.h
+++ b/include/SI/electric_resistance.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/energy.h b/include/SI/energy.h
index 5ffea459..c2c2b1cb 100644
--- a/include/SI/energy.h
+++ b/include/SI/energy.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/equivalent_dose.h b/include/SI/equivalent_dose.h
index e72b13b9..83185636 100644
--- a/include/SI/equivalent_dose.h
+++ b/include/SI/equivalent_dose.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/force.h b/include/SI/force.h
index 5ab74c0d..615a327d 100644
--- a/include/SI/force.h
+++ b/include/SI/force.h
@@ -1,6 +1,6 @@
 
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/frequency.h b/include/SI/frequency.h
index 15ceff85..bb849477 100644
--- a/include/SI/frequency.h
+++ b/include/SI/frequency.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/illuminance.h b/include/SI/illuminance.h
index 41a451d2..5de36551 100644
--- a/include/SI/illuminance.h
+++ b/include/SI/illuminance.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/inductance.h b/include/SI/inductance.h
index 72ebcca6..3e444caa 100644
--- a/include/SI/inductance.h
+++ b/include/SI/inductance.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/length.h b/include/SI/length.h
index ee1546a0..34f9c5fc 100644
--- a/include/SI/length.h
+++ b/include/SI/length.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/luminosity.h b/include/SI/luminosity.h
index 9ea01c78..3e4fb81e 100644
--- a/include/SI/luminosity.h
+++ b/include/SI/luminosity.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/luminous_flux.h b/include/SI/luminous_flux.h
index 58056759..31f0edfe 100644
--- a/include/SI/luminous_flux.h
+++ b/include/SI/luminous_flux.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/magnetic_field.h b/include/SI/magnetic_field.h
index 5b585220..4d493f9b 100644
--- a/include/SI/magnetic_field.h
+++ b/include/SI/magnetic_field.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/magnetic_flux.h b/include/SI/magnetic_flux.h
index 6ee04204..c2f7fbd2 100644
--- a/include/SI/magnetic_flux.h
+++ b/include/SI/magnetic_flux.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/mass.h b/include/SI/mass.h
index be9930d1..eac50559 100644
--- a/include/SI/mass.h
+++ b/include/SI/mass.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/momentum.h b/include/SI/momentum.h
index 1e416b7c..829aaad5 100644
--- a/include/SI/momentum.h
+++ b/include/SI/momentum.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/power.h b/include/SI/power.h
index dd94c027..9d7e3e2c 100644
--- a/include/SI/power.h
+++ b/include/SI/power.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/pressure.h b/include/SI/pressure.h
index 0d740d3f..0e4222c3 100644
--- a/include/SI/pressure.h
+++ b/include/SI/pressure.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/radioactivity.h b/include/SI/radioactivity.h
index b7cc999b..0b63c9d7 100644
--- a/include/SI/radioactivity.h
+++ b/include/SI/radioactivity.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/solid_angle.h b/include/SI/solid_angle.h
index 7ad3ae77..3ca4efed 100644
--- a/include/SI/solid_angle.h
+++ b/include/SI/solid_angle.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/stream.h b/include/SI/stream.h
index e8a18e28..8d91e5a4 100644
--- a/include/SI/stream.h
+++ b/include/SI/stream.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/substance.h b/include/SI/substance.h
index b89ae121..9336f0be 100644
--- a/include/SI/substance.h
+++ b/include/SI/substance.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/temperature.h b/include/SI/temperature.h
index 888d2a73..f6d3f6b8 100644
--- a/include/SI/temperature.h
+++ b/include/SI/temperature.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/time.h b/include/SI/time.h
index fc821c2b..e2e2c537 100644
--- a/include/SI/time.h
+++ b/include/SI/time.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/include/SI/velocity.h b/include/SI/velocity.h
index c932219d..05c061a3 100644
--- a/include/SI/velocity.h
+++ b/include/SI/velocity.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of "SI" version 2.0.5
+ * This file is part of "SI" version 2.1.0
  * A header only c++ library that provides type safety and user defined literals
  * for handling pyhsical values defined in the International System of
  * Units
diff --git a/test/src/derived_unit_tests/electric_charge_tests.cc b/test/src/derived_unit_tests/electric_charge_tests.cc
index 76af5977..141938ae 100644
--- a/test/src/derived_unit_tests/electric_charge_tests.cc
+++ b/test/src/derived_unit_tests/electric_charge_tests.cc
@@ -168,7 +168,7 @@ TEST_CASE("GIVEN a value WHEN constructed with literal _PC THEN result is a "
   constexpr auto one_f = 1.0_PC;
   STATIC_REQUIRE(
       std::is_same_v<decltype(one_f),
-                   const SI::electric_charge_t<long double, std::peta>>);
+                     const SI::electric_charge_t<long double, std::peta>>);
 }
 
 TEST_CASE("GIVEN a value WHEN constructed with literal _EC THEN result is a "
@@ -280,7 +280,7 @@ TEST_CASE("GIVEN electric charge Q with ratio<1000000,1>  AND type is floating "
   constexpr auto result = charge / current;
 
   STATIC_REQUIRE(std::ratio_equal<decltype(result)::ratio, std::mega>::value);
-  STATIC_REQUIRE(SI::detail::epsEqual(result.value(), 0.002L));
+  STATIC_REQUIRE(SI::detail::eps_equals(result.value(), 0.002L));
 }
 
 TEST_CASE("GIVEN electric charge Q with ratio<1> WHEN divided by time T in "
diff --git a/test/src/detail_tests/detail_tests.cc b/test/src/detail_tests/detail_tests.cc
index 96278154..41211ef5 100644
--- a/test/src/detail_tests/detail_tests.cc
+++ b/test/src/detail_tests/detail_tests.cc
@@ -1,135 +1,138 @@
 #include <catch2/catch.hpp>
 
+#include <SI/detail/cross_unit_operations.h>
 #include <SI/detail/detail.h>
 #include <SI/detail/unit.h>
+#include <SI/detail/unit_cast.h>
 
-TEMPLATE_TEST_CASE("EpsEqual comparison of 0 and 0 returns true",
-                   "[detail][epsequal]", long double, double, float) {
+TEMPLATE_TEST_CASE("eps_equals comparison of 0 and 0 returns true",
+                   "[detail][eps_equals]", long double, double, float) {
   constexpr TestType zero{0};
 
-  STATIC_REQUIRE(SI::detail::epsEqual(zero, zero));
+  STATIC_REQUIRE(SI::detail::eps_equals(zero, zero));
 }
 
-TEMPLATE_TEST_CASE("EpsEqual comparison of 0 and epsilon returns false",
-                   "[detail][epsequal]", long double, double, float) {
+TEMPLATE_TEST_CASE("eps_equals comparison of 0 and epsilon returns false",
+                   "[detail][eps_equals]", long double, double, float) {
   constexpr TestType zero{0};
   constexpr TestType half_eps{std::numeric_limits<TestType>::epsilon()};
 
-  STATIC_REQUIRE(!SI::detail::epsEqual(zero, half_eps));
-  STATIC_REQUIRE(!SI::detail::epsEqual(half_eps, zero));
+  STATIC_REQUIRE(!SI::detail::eps_equals(zero, half_eps));
+  STATIC_REQUIRE(!SI::detail::eps_equals(half_eps, zero));
 }
 
-TEMPLATE_TEST_CASE("EpsEqual comparison of 0 and -epsilon returns false",
-                   "[detail][epsequal]", long double, double, float) {
+TEMPLATE_TEST_CASE("eps_equals comparison of 0 and -epsilon returns false",
+                   "[detail][eps_equals]", long double, double, float) {
   constexpr TestType zero{0};
   constexpr TestType half_eps{-std::numeric_limits<TestType>::epsilon()};
 
-  STATIC_REQUIRE(!SI::detail::epsEqual(zero, half_eps));
-  STATIC_REQUIRE(!SI::detail::epsEqual(half_eps, zero));
+  STATIC_REQUIRE(!SI::detail::eps_equals(zero, half_eps));
+  STATIC_REQUIRE(!SI::detail::eps_equals(half_eps, zero));
 }
 
-TEMPLATE_TEST_CASE("EpsEqual comparison of 0 and epsilon/2 returns true",
-                   "[detail][epsequal]", long double, double, float) {
+TEMPLATE_TEST_CASE("eps_equals comparison of 0 and epsilon/2 returns true",
+                   "[detail][eps_equals]", long double, double, float) {
   constexpr TestType zero{0};
   constexpr TestType half_eps{std::numeric_limits<TestType>::epsilon() / 2};
 
-  STATIC_REQUIRE(SI::detail::epsEqual(zero, half_eps));
-  STATIC_REQUIRE(SI::detail::epsEqual(half_eps, zero));
+  STATIC_REQUIRE(SI::detail::eps_equals(zero, half_eps));
+  STATIC_REQUIRE(SI::detail::eps_equals(half_eps, zero));
 }
 
-TEMPLATE_TEST_CASE("EpsEqual comparison of 0 and -epsilon/2 returns true",
-                   "[detail][epsequal]", long double, double, float) {
+TEMPLATE_TEST_CASE("eps_equals comparison of 0 and -epsilon/2 returns true",
+                   "[detail][eps_equals]", long double, double, float) {
   constexpr TestType zero{0};
   constexpr TestType half_eps{-std::numeric_limits<TestType>::epsilon() / 2};
 
-  STATIC_REQUIRE(SI::detail::epsEqual(zero, half_eps));
-  STATIC_REQUIRE(SI::detail::epsEqual(half_eps, zero));
+  STATIC_REQUIRE(SI::detail::eps_equals(zero, half_eps));
+  STATIC_REQUIRE(SI::detail::eps_equals(half_eps, zero));
 }
 
 TEMPLATE_TEST_CASE(
-    "EpsEqual comparison of non_zero and -epsilon/2 returns true",
-    "[detail][epsequal]", long double, double) {
+    "eps_equals comparison of non_zero and -epsilon/2 returns true",
+    "[detail][eps_equals]", long double, double) {
   constexpr TestType non_zero{1234.345};
   constexpr TestType half_eps =
       non_zero + -std::numeric_limits<TestType>::epsilon() / 2;
 
-  STATIC_REQUIRE(SI::detail::epsEqual(non_zero, half_eps));
-  STATIC_REQUIRE(SI::detail::epsEqual(half_eps, non_zero));
+  STATIC_REQUIRE(SI::detail::eps_equals(non_zero, half_eps));
+  STATIC_REQUIRE(SI::detail::eps_equals(half_eps, non_zero));
 }
 
 // not covered by the template test case above because of the different literal
 // construction using 'f'-suffix
 TEST_CASE(
-    "EpsEqual comparison of non_zero and -epsilon/2 returns true for floats",
-    "[detail][epsequal]") {
+    "eps_equals comparison of non_zero and -epsilon/2 returns true for floats",
+    "[detail][eps_equals]") {
   constexpr float non_zero = 1234.345f;
   constexpr float half_eps =
       non_zero + -std::numeric_limits<float>::epsilon() / 2;
 
-  STATIC_REQUIRE(SI::detail::epsEqual(non_zero, half_eps));
-  STATIC_REQUIRE(SI::detail::epsEqual(half_eps, non_zero));
+  STATIC_REQUIRE(SI::detail::eps_equals(non_zero, half_eps));
+  STATIC_REQUIRE(SI::detail::eps_equals(half_eps, non_zero));
 }
 
-TEMPLATE_TEST_CASE("EpsEqual comparison of non_zero and epsilon/2 returns true",
-                   "[detail][epsequal]", long double, double) {
+TEMPLATE_TEST_CASE(
+    "eps_equals comparison of non_zero and epsilon/2 returns true",
+    "[detail][eps_equals]", long double, double) {
   constexpr TestType non_zero{1234.345};
   constexpr TestType half_eps{non_zero +
                               std::numeric_limits<TestType>::epsilon() / 2};
 
-  STATIC_REQUIRE(SI::detail::epsEqual(non_zero, half_eps));
-  STATIC_REQUIRE(SI::detail::epsEqual(half_eps, non_zero));
+  STATIC_REQUIRE(SI::detail::eps_equals(non_zero, half_eps));
+  STATIC_REQUIRE(SI::detail::eps_equals(half_eps, non_zero));
 }
 
 TEST_CASE(
-    "EpsEqual comparison of non_zero and epsilon/2 returns true for floats",
-    "[detail][epsequal]") {
+    "eps_equals comparison of non_zero and epsilon/2 returns true for floats",
+    "[detail][eps_equals]") {
   constexpr float non_zero{1234.345f};
   constexpr float half_eps{non_zero +
                            std::numeric_limits<float>::epsilon() / 2};
 
-  STATIC_REQUIRE(SI::detail::epsEqual(non_zero, half_eps));
-  STATIC_REQUIRE(SI::detail::epsEqual(half_eps, non_zero));
+  STATIC_REQUIRE(SI::detail::eps_equals(non_zero, half_eps));
+  STATIC_REQUIRE(SI::detail::eps_equals(half_eps, non_zero));
 }
 
 TEMPLATE_TEST_CASE(
-    "EpsEqual comparison of non_zero and quiet_NaN returns false",
-    "[detail][epsequal][runtime]", long double, double, float) {
+    "eps_equals comparison of non_zero and quiet_NaN returns false",
+    "[detail][eps_equals][runtime]", long double, double, float) {
   constexpr TestType zero{0};
   constexpr TestType nan{std::numeric_limits<TestType>::quiet_NaN()};
 
-  REQUIRE(!SI::detail::epsEqual(zero, nan));
-  REQUIRE(!SI::detail::epsEqual(nan, zero));
+  REQUIRE(!SI::detail::eps_equals(zero, nan));
+  REQUIRE(!SI::detail::eps_equals(nan, zero));
 }
 
 TEMPLATE_TEST_CASE(
-    "EpsEqual comparison of quiet_NaN and quiet_NaN returns false",
-    "[detail][epsequal][runtime]", long double, double, float) {
+    "eps_equals comparison of quiet_NaN and quiet_NaN returns false",
+    "[detail][eps_equals][runtime]", long double, double, float) {
 
   constexpr TestType nan{std::numeric_limits<TestType>::quiet_NaN()};
 
-  REQUIRE(!SI::detail::epsEqual(nan, nan));
+  REQUIRE(!SI::detail::eps_equals(nan, nan));
 }
 
 TEMPLATE_TEST_CASE(
-    "EpsEqual comparison of signaling_NaN and quiet_NaN returns false",
-    "[detail][epsequal][runtime]", long double, double, float) {
+    "eps_equals comparison of signaling_NaN and quiet_NaN returns false",
+    "[detail][eps_equals][runtime]", long double, double, float) {
 
   constexpr TestType signaling_nan{
       std::numeric_limits<TestType>::signaling_NaN()};
   constexpr TestType quiet_nan{std::numeric_limits<TestType>::quiet_NaN()};
 
-  REQUIRE(!SI::detail::epsEqual(signaling_nan, quiet_nan));
+  REQUIRE(!SI::detail::eps_equals(signaling_nan, quiet_nan));
 }
 
 TEMPLATE_TEST_CASE(
-    "EpsEqual comparison of signaling_NaN and signaling_NaN returns false",
-    "[detail][epsequal][runtime]", long double, double, float) {
+    "eps_equals comparison of signaling_NaN and signaling_NaN returns false",
+    "[detail][eps_equals][runtime]", long double, double, float) {
 
   constexpr TestType signaling_nan{
       std::numeric_limits<TestType>::signaling_NaN()};
   constexpr TestType quiet_nan{std::numeric_limits<TestType>::signaling_NaN()};
 
-  REQUIRE(!SI::detail::epsEqual(signaling_nan, quiet_nan));
+  REQUIRE(!SI::detail::eps_equals(signaling_nan, quiet_nan));
 }
 
 template <typename _type, typename _ratio>
diff --git a/test/src/detail_tests/unit_helper_functions_tests.cc b/test/src/detail_tests/unit_helper_functions_tests.cc
index 26e58441..94602501 100644
--- a/test/src/detail_tests/unit_helper_functions_tests.cc
+++ b/test/src/detail_tests/unit_helper_functions_tests.cc
@@ -1,5 +1,6 @@
 #include <catch2/catch.hpp>
 
+#include <SI/detail/cross_unit_operations.h>
 #include <SI/detail/unit.h>
 
 using namespace SI::detail;
diff --git a/test/src/detail_tests/unit_t_conversions_tests.cc b/test/src/detail_tests/unit_t_conversions_tests.cc
index 8f28dda0..2edc6bed 100644
--- a/test/src/detail_tests/unit_t_conversions_tests.cc
+++ b/test/src/detail_tests/unit_t_conversions_tests.cc
@@ -1,5 +1,6 @@
 #include <catch2/catch.hpp>
 
+#include <SI/detail/cross_unit_operations.h>
 #include <SI/detail/unit.h>
 
 #include <type_traits>
diff --git a/test/src/detail_tests/unit_t_operator_tests.cc b/test/src/detail_tests/unit_t_operator_tests.cc
index 5cc13fde..eddc8d2c 100644
--- a/test/src/detail_tests/unit_t_operator_tests.cc
+++ b/test/src/detail_tests/unit_t_operator_tests.cc
@@ -191,7 +191,7 @@ TEST_CASE(
       std::ratio_equal<typename decltype(result)::ratio, std::milli>::value);
 }
 
-/* This test is not templatized because of the epsEqual comparison of the raw
+/* This test is not templatized because of the eps_equals comparison of the raw
  * values*/
 TEST_CASE(
     "GIVEN two units with different values AND ratio of rhs is small AND type "
@@ -209,7 +209,7 @@ TEST_CASE(
       v1 *
       unit_cast<unit_t<'X', std::ratio<1>, long double, std::ratio<1>>>(v2);
 
-  STATIC_REQUIRE(epsEqual(result.value(), 40.0L));
+  STATIC_REQUIRE(eps_equals(result.value(), 40.0L));
   STATIC_REQUIRE(result == expected);
   STATIC_REQUIRE(std::ratio_equal<typename decltype(result)::ratio,
                                   typename std::milli>::value);
@@ -306,7 +306,7 @@ TEST_CASE("GIVEN two units with the same ratio exponent 1 AND internal type is "
 
   STATIC_REQUIRE(std::is_same<std::remove_const<decltype(result)>::type,
                               decltype(v1)::internal_type>::value);
-  STATIC_REQUIRE(epsEqual(result, 100.0L));
+  STATIC_REQUIRE(eps_equals(result, 100.0L));
 }
 
 TEMPLATE_TEST_CASE(
@@ -340,7 +340,7 @@ TEST_CASE("GIVEN a unit with ratio<1> and a scalar AND internal type is "
   constexpr unit_t<'X', std::ratio<1>, long double, std::ratio<1>> v2{2};
   constexpr auto result = v1 / v2;
 
-  STATIC_REQUIRE(epsEqual(result.value(), 500.0L));
+  STATIC_REQUIRE(eps_equals(result.value(), 500.0L));
 }
 
 TEST_CASE("GIVEN a unit with ratio<1, 1000> and a scalar AND interal type is "
@@ -369,7 +369,7 @@ TEST_CASE("GIVEN a unit with ratio<1, 1000> and a scalar AND interal type is "
   constexpr unit_t<'X', std::ratio<-1>, long double, std::deca> expected{5};
   STATIC_REQUIRE(v2.value() == 2);
   STATIC_REQUIRE(std::ratio_equal<std::deca, decltype(result)::ratio>::value);
-  STATIC_REQUIRE(epsEqual(result.value(), 5.0L));
+  STATIC_REQUIRE(eps_equals(result.value(), 5.0L));
   STATIC_REQUIRE(result == expected);
 }
 
diff --git a/test/version-consistency.sh b/test/version-consistency.sh
index 71321ed9..9e700013 100755
--- a/test/version-consistency.sh
+++ b/test/version-consistency.sh
@@ -4,8 +4,6 @@
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 ROOT_DIR=$(realpath ${SCRIPT_DIR}/../)
 
-set -e
-
 setUp() {
     SI_BUILD_DIR=$(mktemp -d)
     BUILD_DIR=$(mktemp -d)
@@ -15,36 +13,37 @@ tearDown() {
     if [ -d ${SI_BUILD_DIR} ]; then
         rm -rf ${SI_BUILD_DIR}
     fi
-    
+
     if [ -d ${BUILD_DIR} ]; then
         rm -rf ${BUILD_DIR}
     fi
 }
 
 testVersionNumberConsistency() {
+
     CHANGELOG_VERSION=$(sed -n -E '/## [0-9]+\.[0-9]+\.[0-9]+/p' ${ROOT_DIR}/CHANGELOG.md | head -1 | grep -E -o '[0-9]+\.[0-9]+\.[0-9]+')
     ORIG_DIR=$(pwd)
-    
+
     cmake ${ROOT_DIR} -B${SI_BUILD_DIR} -DBUILD_TESTING=off -DCMAKE_BUILD_TYPE=Debug >/dev/null
     cd ${SI_BUILD_DIR}
     CMAKE_VERSION=$(cmake --system-information | grep -E "VERSION:STATIC" | grep -E -o '[0-9]+\.[0-9]+\.[0-9]+')
     cd ${ORIG_DIR}
-    GIT_VERSION_EXACT=$(git describe --tags | { grep -E -o '^[0-9]+\.[0-9]+\.[0-9]+$' || true; } )
-    
+    GIT_VERSION_EXACT=$(git describe --tags | { grep -E -o '^[0-9]+\.[0-9]+\.[0-9]+$' || true; })
+
     assertEquals "version in changelog (${CHANGELOG_VERSION}) does not match cmake version (${CMAKE_VERSION})" $CHANGELOG_VERSION $CMAKE_VERSION
-    
+
     if [ "${GIT_VERSION_EXACT}" != "" ]; then
         assertEquals "version in files (${CMAKE_VERSION}) does not match git tag for release  (${GIT_VERSION_EXACT})" ${CMAKE_VERSION} ${GIT_VERSION_EXACT}
     else
         GIT_VERSION=$(git describe --tags | grep -E -o '^[0-9]+\.[0-9]+\.[0-9]+')
         assertNotEquals "version in files (${CMAKE_VERSION}) matches already existing release (${GIT_VERSION}):" ${CMAKE_VERSION} ${GIT_VERSION}
     fi
-    
+
     for F in $(find ${ROOT_DIR}/include/SI -name "*.h"); do
         FILE_VERSION=$(grep -E 'version [0-9]+\.[0-9]+\.[0-9]+' ${F} | grep -E -o '[0-9]+\.[0-9]+\.[0-9]+')
         assertEquals "version in header file ${F} does not match cmake version" ${CMAKE_VERSION} ${FILE_VERSION}
     done
-    
+
 }
 
 # Load shUnit2.