Index: trunk/FACT++/src/datalogger.cc
===================================================================
--- trunk/FACT++/src/datalogger.cc	(revision 16087)
+++ trunk/FACT++/src/datalogger.cc	(revision 16088)
@@ -1556,5 +1556,5 @@
     for (list<RunNumberType>::const_iterator it=fRunNumber.begin(); it!=fRunNumber.end(); it++)
         str << " " << it->runNumber;
-    if (fRunNumber.size()==0)
+    if (fRunNumber.empty())
         str << " <none>";
     Message(str);
@@ -1607,5 +1607,5 @@
     for (set<string>::const_iterator it=fBlackList.begin(); it != fBlackList.end(); it++)
         Message(" -> "+*it);
-    if (fBlackList.size()==0)
+    if (fBlackList.empty())
         Message(" <empty>");
 
@@ -1613,5 +1613,5 @@
     for (set<string>::const_iterator it=fWhiteList.begin(); it != fWhiteList.end(); it++)
         Message(" -> "+*it);
-    if (fWhiteList.size()==0)
+    if (fWhiteList.empty())
         Message(" <empty>");
 
@@ -1621,5 +1621,5 @@
     for (set<string>::const_iterator it=fGrouping.begin(); it != fGrouping.end(); it++)
         Message(" -> "+*it);
-    if (fGrouping.size()==0)
+    if (fGrouping.empty())
         Message(" <no grouping>");
 
Index: trunk/FACT++/src/fitsdump.cc
===================================================================
--- trunk/FACT++/src/fitsdump.cc	(revision 16087)
+++ trunk/FACT++/src/fitsdump.cc	(revision 16088)
@@ -153,5 +153,5 @@
             fout << ::right << setw(20) << it->second.value;
 
-        if (it->second.comment.size()>0)
+        if (!it->second.comment.empty())
             fout << " / " << it->second.comment;
         fout << '\n';
@@ -186,5 +186,5 @@
     const fits::Table::Columns &fColMap = GetColumns();
 
-    if (names.size()==0)
+    if (names.empty())
         for (auto it=fColMap.begin(); it!=fColMap.end(); it++)
             if (it->second.num>0)
@@ -509,5 +509,5 @@
 
     const vector<MyColumn> vec = InitColumnsRoot(names);
-    if (vec.size()==0)
+    if (vec.empty())
         return;
 
@@ -825,5 +825,5 @@
 
     const vector<MyColumn> cols = InitColumns(conf.Vec<string>("col"));
-    if (cols.size()==0)
+    if (cols.empty())
         return false;
 
Index: trunk/FACT++/src/ftmctrl.cc
===================================================================
--- trunk/FACT++/src/ftmctrl.cc	(revision 16087)
+++ trunk/FACT++/src/ftmctrl.cc	(revision 16088)
@@ -2386,5 +2386,5 @@
         // ---------- Setup clock conditioner frequencies ----------
         const vector<uint16_t> freq = conf.Vec<uint16_t>("clock-conditioner.frequency");
-        if (freq.size()==0)
+        if (freq.empty())
             T::Warn("No frequencies for the clock-conditioner defined.");
         else
@@ -2432,5 +2432,5 @@
         // ---------- Setup run types ---------
         const vector<string> types = conf.Vec<string>("run-type");
-        if (types.size()==0)
+        if (types.empty())
             T::Warn("No run-types defined.");
         else
Index: trunk/FACT++/src/ratecontrol.cc
===================================================================
--- trunk/FACT++/src/ratecontrol.cc	(revision 16087)
+++ trunk/FACT++/src/ratecontrol.cc	(revision 16088)
@@ -100,5 +100,5 @@
         //    return;
 
-        if (fThresholds.size()==0)
+        if (!fThresholds.empty())
             return;
 
@@ -371,5 +371,5 @@
     int HandleTriggerRates(const EventImp &evt)
     {
-        if (fThresholds.size()==0)
+        if (fThresholds.empty())
             return GetCurrentState();
 
@@ -804,5 +804,5 @@
         // ---------- Setup run types ---------
         const vector<string> types = conf.Vec<string>("run-type");
-        if (types.size()==0)
+        if (types.empty())
             Warn("No run-types defined.");
         else