diff --git a/src/csg_boltzmann/bondedstatistics.cc b/src/csg_boltzmann/bondedstatistics.cc
index c79518c8760e0649a0fb5d056673b83c75c60f80..d1ececd034611f9dc8918eee364d41ad5ffa3c24 100644
--- a/src/csg_boltzmann/bondedstatistics.cc
+++ b/src/csg_boltzmann/bondedstatistics.cc
@@ -23,10 +23,8 @@ namespace votca {
 namespace csg {
 
 void BondedStatistics::BeginCG(Topology *top, Topology *) {
-  InteractionContainer &ic = top->BondedInteractions();
-
   _bonded_values.clear();
-  for (auto &interaction : ic) {
+  for (auto &interaction : top->BondedInteractions()) {
     _bonded_values.CreateArray(interaction->getName());
   }
 }
@@ -37,7 +35,7 @@ void BondedStatistics::EvalConfiguration(Topology *conf, Topology *) {
   InteractionContainer &ic = conf->BondedInteractions();
   InteractionContainer::iterator ia;
 
-  DataCollection<double>::container::iterator is;
+  DataCollection<double>::iterator is;
   for (ia = ic.begin(), is = _bonded_values.begin(); ia != ic.end();
        ++ia, ++is) {
     (*is)->push_back((*ia)->EvaluateVar(*conf));
diff --git a/src/csg_boltzmann/bondedstatistics.h b/src/csg_boltzmann/bondedstatistics.h
index 033a227e55236ecd45371eb6c3bab8547ee9f0b3..09d82299687c6f319d414c29c802b91a1791976d 100644
--- a/src/csg_boltzmann/bondedstatistics.h
+++ b/src/csg_boltzmann/bondedstatistics.h
@@ -21,8 +21,6 @@
 #include <votca/csg/cgobserver.h>
 #include <votca/tools/datacollection.h>
 
-namespace TOOLS = votca::tools;
-
 namespace votca {
 namespace csg {
 /**
@@ -42,10 +40,10 @@ class BondedStatistics : public votca::csg::CGObserver {
   void EvalConfiguration(Topology *conf,
                          Topology *conf_atom = nullptr) override;
 
-  TOOLS::DataCollection<double> &BondedValues() { return _bonded_values; }
+  tools::DataCollection<double> &BondedValues() { return _bonded_values; }
 
  protected:
-  TOOLS::DataCollection<double> _bonded_values;
+  tools::DataCollection<double> _bonded_values;
 };
 }  // namespace csg
 }  // namespace votca