diff --git a/src/eal.cpp b/src/eal.cpp
index 364088c0317cb7ce876a8eb7cf7d35dbbbd587c9..32dafd15655471835bccc1a44f682327e4fb3e15 100644
--- a/src/eal.cpp
+++ b/src/eal.cpp
@@ -8,74 +8,75 @@
 
 using json = nlohmann::json;
 
-using namespace eal;
+namespace eal {
+
+  // Parsing the JSON
+  json constructStateFromIsd(const std::string positionRotationData) {
+    // Parse the position and rotation data from isd
+    json isd = json::parse(positionRotationData);
+    json state;
+
+    state["m_w"] = isd.at("w");
+    state["m_x"] = isd.at("x");
+    state["m_y"] = isd.at("y");
+    state["m_z"] = isd.at("z");
+
+    return state;
+  }
+
+  // Positional Functions
+
+  // Position Data Functions
+  vector<double> getPosition(vector<vector<double>> coords, vector<double> times,
+                             string interp, double time) {
+    vector<double> coordinate = {0.0, 0.0, 0.0};
+    return coordinate;
+  }
+
+  vector<double> getVelocity(vector<vector<double>> coords, vector<double> times,
+                             string interp, double time, bool interpolation) {
+    vector<double> coordinate = {0.0, 0.0, 0.0};
+    return coordinate;
+  }
+
+  // Postion Function Functions
+  vector<double> getPosition(vector<double> coeffs, string interp, double time) {
+    vector<double> coordinate = {0.0, 0.0, 0.0};
+    return coordinate;
+  }
+
+  vector<double> getVelocity(vector<double> coeffs, string interp, double time,
+                             bool interpolation) {
+    vector<double> coordinate = {0.0, 0.0, 0.0};
+    return coordinate;
+  }
+
+  // Rotation Data Functions
+
+  // Rotation Data Functions
+  vector<double> getRotation(string from, string to, vector<vector<double>> rotations,
+                             vector<double> times, string interp, double time) {
+    vector<double> coordinate = {0.0, 0.0, 0.0};
+    return coordinate;
+  }
+
+  vector<double> getAngularVelocity(string from, string to, vector<vector<double>> rotations,
+                                    vector<double> times, string interp, double time, bool interpolation) {
+    vector<double> coordinate = {0.0, 0.0, 0.0};
+    return coordinate;
+  }
+
+  // Rotation Function Functions
+  vector<double> getRotation(string from, string to, vector<double> coefficients,
+                             string interp, double time) {
+    vector<double> coordinate = {0.0, 0.0, 0.0};
+    return coordinate;
+  }
+
+  vector<double> getAngularVelocity(string from, string to, vector<double> coefficients,
+                                    string interp, double time) {
+    vector<double> coordinate = {0.0, 0.0, 0.0};
+    return coordinate;
+  }
 
-
-// Parsing the JSON
-json constructStateFromIsd(const std::string positionRotationData) {
-   // Parse the position and rotation data from isd
-   json isd = json::parse(positionRotationData);
-   json state;
-
-   state["m_w"] = isd.at("w");
-   state["m_x"] = isd.at("x");
-   state["m_y"] = isd.at("y");
-   state["m_z"] = isd.at("z");
-
-   return state;
- }
-
-// Positional Functions
-
-// Position Data Functions
-vector<double> getPosition(vector<vector<double>> coords, vector<double> times,
-                           string interp, double time) {
-  vector<double> coordinate = {0.0, 0.0, 0.0};
-  return coordinate;
-}
-
-vector<double> getVelocity(vector<vector<double>> coords, vector<double> times,
-                           string interp, double time, bool interpolation) {
-  vector<double> coordinate = {0.0, 0.0, 0.0};
-  return coordinate;
-}
-
-// Postion Function Functions
-vector<double> getPosition(vector<double> coeffs, string interp, double time) {
-  vector<double> coordinate = {0.0, 0.0, 0.0};
-  return coordinate;
-}
-
-vector<double> getVelocity(vector<double> coeffs, string interp, double time,
-                           bool interpolation) {
-  vector<double> coordinate = {0.0, 0.0, 0.0};
-  return coordinate;
-}
-
-// Rotation Data Functions
-
-// Rotation Data Functions
-vector<double> getRotation(string from, string to, vector<vector<double>> rotations,
-                           vector<double> times, string interp, double time) {
-  vector<double> coordinate = {0.0, 0.0, 0.0};
-  return coordinate;
-}
-
-vector<double> getAngularVelocity(string from, string to, vector<vector<double>> rotations,
-                                  vector<double> times, string interp, double time, bool interpolation) {
-  vector<double> coordinate = {0.0, 0.0, 0.0};
-  return coordinate;
-}
-
-// Rotation Function Functions
-vector<double> getRotation(string from, string to, vector<double> coefficients,
-                           string interp, double time) {
-  vector<double> coordinate = {0.0, 0.0, 0.0};
-  return coordinate;
-}
-
-vector<double> getAngularVelocity(string from, string to, vector<double> coefficients,
-                                  string interp, double time) {
-  vector<double> coordinate = {0.0, 0.0, 0.0};
-  return coordinate;
 }