diff --git a/moses/FF/FeatureFunction.cpp b/moses/FF/FeatureFunction.cpp
index d9cb3f1ae..5de14defe 100644
--- a/moses/FF/FeatureFunction.cpp
+++ b/moses/FF/FeatureFunction.cpp
@@ -55,7 +55,7 @@ FeatureFunction(const std::string& line, bool registerNow)
   m_numTuneableComponents = m_numScoreComponents;
   ParseLine(line);
   // if (registerNow) Register(); // now done in FeatureFactory::DefaultSetup()
-  // TO DO: eliminate the registerNow parameter 
+  // TO DO: eliminate the registerNow parameter
 }
 
 FeatureFunction::FeatureFunction(size_t numScoreComponents, const std::string& line, bool registerNow)
@@ -68,7 +68,7 @@ FeatureFunction::FeatureFunction(size_t numScoreComponents, const std::string& l
   m_numTuneableComponents = m_numScoreComponents;
   ParseLine(line);
   // if (registerNow) Register(); // now done in FeatureFactory::DefaultSetup()
-  // TO DO: eliminate the registerNow parameter 
+  // TO DO: eliminate the registerNow parameter
 }
 
 void
diff --git a/moses/LM/Ken.cpp b/moses/LM/Ken.cpp
index 6914554a5..428640290 100644
--- a/moses/LM/Ken.cpp
+++ b/moses/LM/Ken.cpp
@@ -157,8 +157,7 @@ template <class Model> LanguageModelKen<Model>::LanguageModelKen(const std::stri
   lm::ngram::Config config;
   if(this->m_verbosity >= 1) {
     config.messages = &std::cerr;
-  }
-  else {
+  } else {
     config.messages = NULL;
   }
   FactorCollection &collection = FactorCollection::Instance();
diff --git a/moses/ScoreComponentCollectionTest.cpp b/moses/ScoreComponentCollectionTest.cpp
index b4e4ce32a..da7e99ea1 100644
--- a/moses/ScoreComponentCollectionTest.cpp
+++ b/moses/ScoreComponentCollectionTest.cpp
@@ -89,8 +89,7 @@ public:
 
 
 struct MockProducers {
-  MockProducers() 
-  {
+  MockProducers() {
     FeatureFunction::Register(&single);
     FeatureFunction::Register(&multi);
     FeatureFunction::Register(&sparse);