diff --git a/Plugins/LocatePlugin.h b/Plugins/LocatePlugin.h
index abd476b70..0eec321d5 100644
--- a/Plugins/LocatePlugin.h
+++ b/Plugins/LocatePlugin.h
@@ -32,7 +32,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../Util/StringUtil.h"
 
 //locates the nearest node in the road network for a given coordinate.
-//TODO: Rework data access to go through facade
 
 template<class DataFacadeT>
 class LocatePlugin : public BasePlugin {
@@ -70,7 +69,12 @@ public:
         reply.status = http::Reply::ok;
         reply.content += ("{");
         reply.content += ("\"version\":0.3,");
-        if(!facade->LocateClosestEndPointForCoordinate(routeParameters.coordinates[0], result)) {
+        if(
+            !facade->LocateClosestEndPointForCoordinate(
+                routeParameters.coordinates[0],
+                result
+             )
+        ) {
             reply.content += ("\"status\":207,");
             reply.content += ("\"mapped_coordinate\":[]");
         } else {
diff --git a/Plugins/TimestampPlugin.h b/Plugins/TimestampPlugin.h
index 1e10a362e..80ac92290 100644
--- a/Plugins/TimestampPlugin.h
+++ b/Plugins/TimestampPlugin.h
@@ -29,7 +29,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define TIMESTAMPPLUGIN_H_
 
 #include "BasePlugin.h"
-//TODO: Rework data access to go through facade
 
 template<class DataFacadeT>
 class TimestampPlugin : public BasePlugin {
diff --git a/Plugins/ViaRoutePlugin.h b/Plugins/ViaRoutePlugin.h
index c310d3928..057c2f56c 100644
--- a/Plugins/ViaRoutePlugin.h
+++ b/Plugins/ViaRoutePlugin.h
@@ -46,7 +46,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include <vector>
 
-//TODO: Rework data access to go through facade
 template<class DataFacadeT>
 class ViaRoutePlugin : public BasePlugin {
 private: