diff --git a/include/engine/datafacade/shared_datafacade.hpp b/include/engine/datafacade/shared_datafacade.hpp
index 225056f89..91d917f96 100644
--- a/include/engine/datafacade/shared_datafacade.hpp
+++ b/include/engine/datafacade/shared_datafacade.hpp
@@ -270,7 +270,7 @@ template <class EdgeDataT> class SharedDataFacade final : public BaseDataFacade<
             SimpleLogger().Write() << "number of geometries: " << m_coordinate_list->size();
             for (unsigned i = 0; i < m_coordinate_list->size(); ++i)
             {
-                if (!GetCoordinateOfNode(i).is_valid())
+                if (!GetCoordinateOfNode(i).IsValid())
                 {
                     SimpleLogger().Write() << "coordinate " << i << " not valid";
                 }
diff --git a/include/engine/plugins/nearest.hpp b/include/engine/plugins/nearest.hpp
index e22a91e65..8db98ae40 100644
--- a/include/engine/plugins/nearest.hpp
+++ b/include/engine/plugins/nearest.hpp
@@ -27,7 +27,7 @@ template <class DataFacadeT> class NearestPlugin final : public BasePlugin
     {
         // check number of parameters
         if (route_parameters.coordinates.empty() ||
-            !route_parameters.coordinates.front().is_valid())
+            !route_parameters.coordinates.front().IsValid())
         {
             return Status::Error;
         }
diff --git a/include/engine/plugins/plugin_base.hpp b/include/engine/plugins/plugin_base.hpp
index d7fe94983..7301d44c6 100644
--- a/include/engine/plugins/plugin_base.hpp
+++ b/include/engine/plugins/plugin_base.hpp
@@ -33,7 +33,7 @@ class BasePlugin
         if (min > coordinates.size() || std::any_of(std::begin(coordinates), std::end(coordinates),
                                                     [](const FixedPointCoordinate &coordinate)
                                                     {
-                                                        return !coordinate.is_valid();
+                                                        return !coordinate.IsValid();
                                                     }))
         {
             return false;
diff --git a/include/osrm/coordinate.hpp b/include/osrm/coordinate.hpp
index 9c001029a..2ff3705ae 100644
--- a/include/osrm/coordinate.hpp
+++ b/include/osrm/coordinate.hpp
@@ -55,17 +55,11 @@ struct FixedPointCoordinate
                       "coordinate types incompatible");
     }
 
-    bool is_valid() const;
+    bool IsValid() const;
     bool operator==(const FixedPointCoordinate &other) const;
-
-    double bearing(const FixedPointCoordinate &other) const;
-    void output(std::ostream &out) const;
+    friend std::ostream &operator<<(std::ostream &out, const FixedPointCoordinate &coordinate);
 };
 
-inline std::ostream &operator<<(std::ostream &out_stream, FixedPointCoordinate const &coordinate)
-{
-    coordinate.output(out_stream);
-    return out_stream;
-}
+std::ostream &operator<<(std::ostream &out, const FixedPointCoordinate &coordinate);
 
 #endif /* COORDINATE_HPP_ */
diff --git a/src/engine/phantom_node.cpp b/src/engine/phantom_node.cpp
index bc960bb58..7281d57bf 100644
--- a/src/engine/phantom_node.cpp
+++ b/src/engine/phantom_node.cpp
@@ -65,12 +65,12 @@ bool PhantomNode::is_compressed() const { return (forward_offset != 0) || (rever
 
 bool PhantomNode::is_valid(const unsigned number_of_nodes) const
 {
-    return location.is_valid() &&
+    return location.IsValid() &&
            ((forward_node_id < number_of_nodes) || (reverse_node_id < number_of_nodes)) &&
            ((forward_weight != INVALID_EDGE_WEIGHT) || (reverse_weight != INVALID_EDGE_WEIGHT)) &&
            (component.id != INVALID_COMPONENTID) && (name_id != INVALID_NAMEID);
 }
 
-bool PhantomNode::is_valid() const { return location.is_valid() && (name_id != INVALID_NAMEID); }
+bool PhantomNode::is_valid() const { return location.IsValid() && (name_id != INVALID_NAMEID); }
 
 bool PhantomNode::operator==(const PhantomNode &other) const { return location == other.location; }
diff --git a/src/util/coordinate.cpp b/src/util/coordinate.cpp
index e008fff6d..0092b01cf 100644
--- a/src/util/coordinate.cpp
+++ b/src/util/coordinate.cpp
@@ -34,7 +34,7 @@ FixedPointCoordinate::FixedPointCoordinate(int lat, int lon) : lat(lat), lon(lon
 #endif
 }
 
-bool FixedPointCoordinate::is_valid() const
+bool FixedPointCoordinate::IsValid() const
 {
     return !(lat > 90 * COORDINATE_PRECISION || lat < -90 * COORDINATE_PRECISION ||
              lon > 180 * COORDINATE_PRECISION || lon < -180 * COORDINATE_PRECISION);
@@ -45,12 +45,8 @@ bool FixedPointCoordinate::operator==(const FixedPointCoordinate &other) const
     return lat == other.lat && lon == other.lon;
 }
 
-void FixedPointCoordinate::output(std::ostream &out) const
+std::ostream &operator<<(std::ostream &out, const FixedPointCoordinate &coordinate)
 {
-    out << "(" << lat / COORDINATE_PRECISION << "," << lon / COORDINATE_PRECISION << ")";
-}
-
-double FixedPointCoordinate::bearing(const FixedPointCoordinate &other) const
-{
-    return coordinate_calculation::bearing(other, *this);
+    out << "(" << static_cast<double>(coordinate.lat / COORDINATE_PRECISION) << "," << static_cast<double>(coordinate.lon / COORDINATE_PRECISION) << ")";
+    return out;
 }
diff --git a/src/util/coordinate_calculation.cpp b/src/util/coordinate_calculation.cpp
index 6213ba7e6..2e6a3137e 100644
--- a/src/util/coordinate_calculation.cpp
+++ b/src/util/coordinate_calculation.cpp
@@ -124,7 +124,7 @@ perpendicularDistanceFromProjectedCoordinate(const FixedPointCoordinate &segment
                                              FixedPointCoordinate &nearest_location,
                                              double &ratio)
 {
-    BOOST_ASSERT(query_location.is_valid());
+    BOOST_ASSERT(query_location.IsValid());
 
     // initialize values
     const double x = projected_coordinate.first;
@@ -188,7 +188,7 @@ perpendicularDistanceFromProjectedCoordinate(const FixedPointCoordinate &segment
         nearest_location.lat = static_cast<int>(mercator::y2lat(p) * COORDINATE_PRECISION);
         nearest_location.lon = static_cast<int>(q * COORDINATE_PRECISION);
     }
-    BOOST_ASSERT(nearest_location.is_valid());
+    BOOST_ASSERT(nearest_location.IsValid());
 
     const double approximate_distance = greatCircleDistance(query_location, nearest_location);
     BOOST_ASSERT(0.0 <= approximate_distance);