diff --git a/src/nlsr.cpp b/src/nlsr.cpp
index 6f85d2c..76d841d 100644
--- a/src/nlsr.cpp
+++ b/src/nlsr.cpp
@@ -151,10 +151,10 @@
   ndn::Name keyPrefix = DEFAULT_BROADCAST_PREFIX;
   keyPrefix.append("KEYS");
   m_nlsrFace.setInterestFilter(keyPrefix,
-                                  ndn::bind(&Nlsr::onKeyInterest,
-                                            this, _1, _2),
-                                  ndn::bind(&Nlsr::onKeyPrefixRegSuccess, this, _1),
-                                  ndn::bind(&Nlsr::registrationFailed, this, _1));
+                               ndn::bind(&Nlsr::onKeyInterest,
+                                         this, _1, _2),
+                               ndn::bind(&Nlsr::onKeyPrefixRegSuccess, this, _1),
+                               ndn::bind(&Nlsr::registrationFailed, this, _1));
 
 }
 
diff --git a/src/validator.hpp b/src/validator.hpp
index abe957b..365a863 100644
--- a/src/validator.hpp
+++ b/src/validator.hpp
@@ -112,16 +112,12 @@
 
   }
 
-  void
-  onData(const ndn::Interest& interest,
-         const ndn::Data& data,
-         const ndn::shared_ptr<ndn::ValidationRequest>& nextStep)
+  virtual ndn::shared_ptr<const ndn::Data>
+  preCertificateValidation(const ndn::Data& data)
   {
-
     ndn::shared_ptr<ndn::Data> internalData = ndn::make_shared<ndn::Data>();
     internalData->wireDecode(data.getContent().blockFromValue());
-    validate(*internalData,
-             nextStep->m_onValidated, nextStep->m_onDataValidated, nextStep->m_nSteps);
+    return internalData;
   }
 
 private: