diff --git a/Angle.cpp b/Angle.cpp
index cb7b6e0..39f12df 100644
--- a/Angle.cpp
+++ b/Angle.cpp
@@ -9,16 +9,12 @@
 const float Rad2Deg = 57.29578F;
 const float Deg2Rad = 0.0174532924F;
 
-//----------------------
-
-template <typename T> AngleOf<T>::AngleOf() : value(0) {}
-
-template <typename T> const AngleOf<T> AngleOf<T>::zero = AngleOf<T>();
-
 //===== Generic
 
 template <typename T> AngleOf<T>::AngleOf() : value(0) {}
 
+template <typename T> AngleOf<T>::AngleOf(T rawValue) : value(rawValue) {}
+
 template <typename T> const AngleOf<T> AngleOf<T>::zero = AngleOf<T>();
 
 template <typename T> AngleOf<T> AngleOf<T>::Binary(T rawValue) {
@@ -286,7 +282,7 @@ template <> AngleOf<float> AngleOf<float>::Degrees(float degrees) {
       degrees -= 360;
   }
 
-  return Binary(degrees);
+  return AngleOf<float>(degrees);
 }
 
 template <> AngleOf<float> AngleOf<float>::Radians(float radians) {
diff --git a/Angle.h b/Angle.h
index f8a215f..501a2dd 100644
--- a/Angle.h
+++ b/Angle.h
@@ -211,7 +211,7 @@ public:
 private:
   T value;
 
-  AngleOf<T>(T value);
+  AngleOf<T>(T rawValue);
 };
 
 // using Angle = AngleOf<float>;