diff --git a/mert/CderScorer.cpp b/mert/CderScorer.cpp
index 124c78627..0bbeb7e70 100644
--- a/mert/CderScorer.cpp
+++ b/mert/CderScorer.cpp
@@ -12,9 +12,9 @@ inline int CalcDistance(int word1, int word2) {
 
 } // namespace
 
-CderScorer::CderScorer(const string& config, bool longJumps)
-    : StatisticsBasedScorer("CDER",config),
-      longJumpsAllowed(longJumps) {}
+CderScorer::CderScorer(const string& config, bool allowed_long_jumps)
+    : StatisticsBasedScorer("CDER", config),
+      m_allowed_long_jumps(allowed_long_jumps) {}
 
 CderScorer::~CderScorer() {}
 
@@ -103,13 +103,13 @@ void CderScorer::computeCD(const sent_t& cand, const sent_t& ref,
       (*nextRow)[i] = *min_element(possibleCosts.begin(), possibleCosts.end());
     }
 
-    if (longJumpsAllowed) {
-        // Cost of LongJumps is the same for all in the row
-        int LJ = 1 + *min_element(nextRow->begin(), nextRow->end());
-    
-        for (int i = 0; i < I; ++i) {
-          (*nextRow)[i] = min((*nextRow)[i], LJ); // LongJumps
-        }
+    if (m_allowed_long_jumps) {
+      // Cost of LongJumps is the same for all in the row
+      int LJ = 1 + *min_element(nextRow->begin(), nextRow->end());
+
+      for (int i = 0; i < I; ++i) {
+        (*nextRow)[i] = min((*nextRow)[i], LJ); // LongJumps
+      }
     }
 
     delete row;
diff --git a/mert/CderScorer.h b/mert/CderScorer.h
index 45989994a..dc6714115 100644
--- a/mert/CderScorer.h
+++ b/mert/CderScorer.h
@@ -8,9 +8,12 @@
 
 using namespace std;
 
+/**
+ * CderScorer class can compute both CDER and WER metric.
+ */
 class CderScorer: public StatisticsBasedScorer {
  public:
-  explicit CderScorer(const string& config, bool longJumps = true);
+  explicit CderScorer(const string& config, bool allowed_long_jumps = true);
   ~CderScorer();
 
   virtual void setReferenceFiles(const vector<string>& referenceFiles);
@@ -24,8 +27,7 @@ class CderScorer: public StatisticsBasedScorer {
   virtual float calculateScore(const vector<int>& comps) const;
 
  private:
-  
-  bool longJumpsAllowed;
+  bool m_allowed_long_jumps;
 
   typedef vector<int> sent_t;
   vector<vector<sent_t> > m_ref_sentences;