diff --git a/packages/CLPBN/horus/Indexer.h b/packages/CLPBN/horus/Indexer.h
index 9ff78191b..262d6034b 100644
--- a/packages/CLPBN/horus/Indexer.h
+++ b/packages/CLPBN/horus/Indexer.h
@@ -151,8 +151,8 @@ Indexer::valid (void) const
 inline void
 Indexer::reset (void)
 {
-  std::fill (indices_.begin(), indices_.end(), 0);
   index_ = 0;
+  std::fill (indices_.begin(), indices_.end(), 0);
 }
 
 
@@ -208,9 +208,9 @@ class MapIndexer {
     template <typename T>
     MapIndexer (
         const std::vector<T>& allArgs,
-        const Ranges&    allRanges,
+        const Ranges& allRanges,
         const std::vector<T>& wantedArgs,
-        const Ranges&    wantedRanges);
+        const Ranges& wantedRanges);
 
     MapIndexer& operator++ (void);
 
@@ -274,11 +274,11 @@ MapIndexer::MapIndexer (const Ranges& ranges, size_t dim)
 template <typename T> inline
 MapIndexer::MapIndexer (
     const std::vector<T>& allArgs,
-    const Ranges&    allRanges,
+    const Ranges& allRanges,
     const std::vector<T>& wantedArgs,
-    const Ranges&    wantedRanges)
-      : index_(0), indices_(allArgs.size(), 0), ranges_(allRanges),
-       valid_(true)
+    const Ranges& wantedRanges)
+    : index_(0), indices_(allArgs.size(), 0), ranges_(allRanges),
+      valid_(true)
 {
   size_t prod = 1;
   std::vector<size_t> offsets (wantedRanges.size());
@@ -345,8 +345,8 @@ MapIndexer::valid (void) const
 inline void
 MapIndexer::reset (void)
 {
-  std::fill (indices_.begin(), indices_.end(), 0);
   index_ = 0;
+  std::fill (indices_.begin(), indices_.end(), 0);
 }
 
 
diff --git a/packages/CLPBN/horus/LiftedVe.h b/packages/CLPBN/horus/LiftedVe.h
index bc3c801ff..862231b47 100644
--- a/packages/CLPBN/horus/LiftedVe.h
+++ b/packages/CLPBN/horus/LiftedVe.h
@@ -37,8 +37,10 @@ class LiftedOperator {
 class ProductOperator : public LiftedOperator {
   public:
     ProductOperator (
-        ParfactorList::iterator g1, ParfactorList::iterator g2,
-        ParfactorList& pfList) : g1_(g1), g2_(g2), pfList_(pfList) { }
+        ParfactorList::iterator g1,
+        ParfactorList::iterator g2,
+        ParfactorList& pfList)
+        : g1_(g1), g2_(g2), pfList_(pfList) { }
 
     double getLogCost (void);
 
diff --git a/packages/CLPBN/horus/Parfactor.h b/packages/CLPBN/horus/Parfactor.h
index 545b9d845..dd25d4f2e 100644
--- a/packages/CLPBN/horus/Parfactor.h
+++ b/packages/CLPBN/horus/Parfactor.h
@@ -15,10 +15,7 @@ namespace Horus {
 
 class Parfactor : public TFactor<ProbFormula> {
   public:
-    Parfactor (
-        const ProbFormulas&,
-        const Params&,
-        const Tuples&,
+    Parfactor (const ProbFormulas&, const Params&, const Tuples&,
         unsigned distId);
 
     Parfactor (const Parfactor*, const Tuple&);