diff --git a/openbr/core/core.cpp b/openbr/core/core.cpp
index 2133c1f..620dfe2 100644
--- a/openbr/core/core.cpp
+++ b/openbr/core/core.cpp
@@ -305,7 +305,7 @@ struct AlgorithmCore
         tail.removeFirst();
 
         QStringList toRemove;
-        foreach(const QString &s, tail)
+        foreach (const QString &s, tail)
             toRemove.append(s.split(',').at(1));
 
         QSet<QString> duplicates = QSet<QString>::fromList(toRemove);
@@ -313,7 +313,7 @@ struct AlgorithmCore
         QStringList fileNames = inputFiles.names();
 
         QList<int> indices;
-        foreach(const QString &d, duplicates)
+        foreach (const QString &d, duplicates)
             indices.append(fileNames.indexOf(d));
 
         std::sort(indices.begin(),indices.end(),std::greater<float>());
@@ -426,10 +426,8 @@ struct AlgorithmCore
         // which compares incoming templates against a gallery, we will handle enrollment of the row set by simply
         // building a transform that does enrollment (using the current algorithm), then does the comparison in one
         // step. This way, we don't have to retain the complete enrolled row gallery in memory, or on disk.
-        else if(!(QStringList() << "gal" << "mem" << "template").contains(rowGallery.suffix()))
-        {
+        else if (!(QStringList() << "gal" << "mem" << "template").contains(rowGallery.suffix()))
             needEnrollRows = true;
-        }
 
         // At this point, we have decided how we will structure the comparison (either in transpose mode, or not), 
         // and have the column gallery enrolled, and have decided whether or not we need to enroll the row gallery.
diff --git a/openbr/core/eval.cpp b/openbr/core/eval.cpp
index 8679a10..27ac297 100644
--- a/openbr/core/eval.cpp
+++ b/openbr/core/eval.cpp
@@ -332,16 +332,14 @@ float InplaceEval(const QString &simmat, const QString &target, const QString &q
 
     qint64 idx  = 0;
     bool done = false;
-    do 
-    {
+    do {
         TemplateList temp = columnGal->readBlock(&done);
         QStringList tempLabels = File::get<QString>(temp, "Label");
 
-        foreach(QString st, tempLabels)
-        {
-            if (!galleryIndices.contains(st)) {
+        foreach (QString st, tempLabels) {
+            if (!galleryIndices.contains(st))
                 galleryIndices.insert(st, QList<qint64>());
-            }
+
             galleryIndices[st].append(idx);
             idx++;
         }
@@ -357,21 +355,17 @@ float InplaceEval(const QString &simmat, const QString &target, const QString &q
     probeGallery->set_readBlockSize(10000);
     done = false;
     qint64 row_count = 0;
-    do
-    {
+    do {
         TemplateList temp = probeGallery->readBlock(&done);
         QStringList probeLabels = File::get<QString>(temp, "Label");
 
-        for (int i=0; i < probeLabels.size();i++)
-        {
+        for (int i=0; i < probeLabels.size();i++) {
             row_count++;
-            if (!galleryIndices.contains(probeLabels[i])) {
+            if (!galleryIndices.contains(probeLabels[i]))
                 continue;
-            }
 
             QList<qint64> colMask = galleryIndices[probeLabels[i]];
-            foreach(qint64 colID, colMask)
-            {
+            foreach (qint64 colID, colMask) {
                 float score;
                 file.seek(data_pos + i * rowSize + colID * typeSize);
                 file.read((char *) &score, sizeof(float));
@@ -383,7 +377,7 @@ float InplaceEval(const QString &simmat, const QString &target, const QString &q
             }
         }
 
-    } while(!done);
+    } while (!done);
 
     QMap<float, GenImpCounts> noImpostors = genScoresToCounts;
 
@@ -403,16 +397,14 @@ float InplaceEval(const QString &simmat, const QString &target, const QString &q
     Mat blockMat(bSize, cols, CV_32FC1);
 
     qint64 bCount = 0;
-    do
-    {
+    do {
         bCount++;
         TemplateList temp = probeGallery2->readBlock(&done);
         QStringList probeLabels = File::get<QString>(temp, "Label");
         temp.clear();
 
         file.read((char *) blockMat.data, rowSize * probeLabels.length());
-        for (int i=0; i < probeLabels.size();i++)
-        {
+        for (int i=0; i < probeLabels.size();i++) {
             row_count++;
             aRow = blockMat.row(i);
 
@@ -445,8 +437,7 @@ float InplaceEval(const QString &simmat, const QString &target, const QString &q
                 i->impCount++;
             }
         }
-
-    } while(!done);
+    } while (!done);
 
     QList<OperatingPoint> operatingPoints;
     qint64 genAccum = 0;
diff --git a/openbr/core/qtutils.cpp b/openbr/core/qtutils.cpp
index cd1f915..085a7a5 100644
--- a/openbr/core/qtutils.cpp
+++ b/openbr/core/qtutils.cpp
@@ -105,9 +105,9 @@ void writeFile(const QString &file, const QStringList &lines)
     if (!f.open(QFile::WriteOnly))
         qFatal("Failed to open %s for writing.", qPrintable(file));
 
-    foreach(const QString & line, lines) {
+    foreach (const QString & line, lines)
         f.write((line+"\n").toLocal8Bit() );
-    }
+
     f.close();
 }
 
@@ -429,7 +429,7 @@ QString toString(const QVariantList &variantList)
 {
     QStringList variants;
 
-    foreach(const QVariant &variant, variantList)
+    foreach (const QVariant &variant, variantList)
         variants.append(toString(variant));
 
     if (!variants.isEmpty()) return "[" + variants.join(", ") + "]";
diff --git a/openbr/openbr_plugin.cpp b/openbr/openbr_plugin.cpp
index e127f55..a720431 100644
--- a/openbr/openbr_plugin.cpp
+++ b/openbr/openbr_plugin.cpp
@@ -205,7 +205,7 @@ QList<QRectF> File::namedRects() const
         const QVariant &variant = m_metadata[key];
         if (variant.canConvert<QRectF>())
             rects.append(variant.value<QRectF>());
-        else if(variant.canConvert<QList<QRectF> >()) {
+        else if (variant.canConvert<QList<QRectF> >()) {
             QList<QRectF> list = variant.value<QList<QRectF> >();
             for (int i=0;i < list.size();i++)
             {
@@ -1323,8 +1323,7 @@ QList<Transform *> Transform::getChildren() const
 
 TemplateEvent *Transform::getEvent(const QString &name)
 {
-    foreach(Transform *child, getChildren())
-    {
+    foreach (Transform *child, getChildren()) {
         TemplateEvent *probe = child->getEvent(name);
         if (probe)
             return probe;
@@ -1347,9 +1346,9 @@ void Transform::train(const TemplateList &data)
 void Transform::train(const QList<TemplateList> &data)
 {
     TemplateList combined;
-    foreach(const TemplateList &set, data) {
+    foreach (const TemplateList &set, data)
         combined.append(set);
-    }
+
     train(combined);
 }
 
diff --git a/openbr/openbr_plugin.h b/openbr/openbr_plugin.h
index 0f9d8a0..bc30f40 100644
--- a/openbr/openbr_plugin.h
+++ b/openbr/openbr_plugin.h
@@ -494,7 +494,7 @@ struct TemplateList : public QList<Template>
         int sum = 0;
         QList<TemplateList> partitions; partitions.reserve(partitionSizes.size());
 
-        for(int i=0; i<partitionSizes.size(); i++) {
+        for (int i=0; i<partitionSizes.size(); i++) {
             partitions.append(TemplateList());
             sum+=partitionSizes[i];
         }
diff --git a/openbr/plugins/format.cpp b/openbr/plugins/format.cpp
index 66a8f4b..48e7eeb 100644
--- a/openbr/plugins/format.cpp
+++ b/openbr/plugins/format.cpp
@@ -62,7 +62,7 @@ public:
         }
 
         bool open = true;
-        while(open) {
+        while (open) {
             cv::Mat frame;
             open = videoSource.read(frame);
             if (!open) break;
diff --git a/openbr/plugins/gui.cpp b/openbr/plugins/gui.cpp
index 54f37c9..3b04c11 100644
--- a/openbr/plugins/gui.cpp
+++ b/openbr/plugins/gui.cpp
@@ -261,7 +261,7 @@ public:
                 // rclick -- reset state if drawing, remove last rect if done
                 else if (mouseEvent->button() == Qt::RightButton && (!rects.isEmpty() || drawingRect))
                 {
-                    if(drawingRect)
+                    if (drawingRect)
                         drawingRect = false;
                     else
                     {
@@ -343,7 +343,7 @@ class PointMarkingWindow : public DisplayWindow
 
             QPainter painter(&pixmapBuffer);
             painter.setBrush(Qt::red);
-            foreach(const QPointF &point, points) painter.drawEllipse(point, 4, 4);
+            foreach (const QPointF &point, points) painter.drawEllipse(point, 4, 4);
 
             setPixmap(pixmapBuffer);
 
@@ -458,7 +458,7 @@ public slots:
         wait.wait(&lock);
 
         QStringList values;
-        for(int i = 0; i<fields.size(); i++) {
+        for (int i = 0; i<fields.size(); i++) {
             values.append(fields.at(i)->text());
             fields[i]->clear();
         }
@@ -482,7 +482,7 @@ private:
     void createForm()
     {
         if (fields.size() != keys.size()) {
-            foreach(const QString& label, keys) {
+            foreach (const QString& label, keys) {
                 QLineEdit *edit = new QLineEdit;
                 fields.append(edit);
                 QFormLayout *form = new QFormLayout;
@@ -672,7 +672,7 @@ public:
             return;
 
         for (int i = 0; i < dst.size(); i++) {
-            foreach(const cv::Mat &m, dst[i]) {
+            foreach (const cv::Mat &m, dst[i]) {
                 qImageBuffer = toQImage(m);
                 displayBuffer->convertFromImage(qImageBuffer);
 
@@ -727,7 +727,7 @@ public:
             return;
 
         for (int i = 0; i < dst.size(); i++) {
-            foreach(const cv::Mat &m, dst[i]) {
+            foreach (const cv::Mat &m, dst[i]) {
                 qImageBuffer = toQImage(m);
                 displayBuffer->convertFromImage(qImageBuffer);
 
@@ -823,14 +823,14 @@ public:
         if (src.empty()) return;
 
         for (int i = 0; i < dst.size(); i++) {
-            foreach(const cv::Mat &m, dst[i]) {
+            foreach (const cv::Mat &m, dst[i]) {
                 qImageBuffer = toQImage(m);
                 displayBuffer->convertFromImage(qImageBuffer);
 
                 emit updateImage(displayBuffer->copy(displayBuffer->rect()));
 
                 QStringList metadata = gui->waitForButtonPress();
-                for(int j = 0; j < keys.size(); j++) dst[i].file.set(keys[j],metadata[j]);
+                for (int j = 0; j < keys.size(); j++) dst[i].file.set(keys[j],metadata[j]);
             }
         }
     }
@@ -895,7 +895,7 @@ public:
             return;
 
         for (int i = 0; i < dst.size(); i++) {
-            foreach(const cv::Mat &m, dst[i]) {
+            foreach (const cv::Mat &m, dst[i]) {
                 qImageBuffer = toQImage(m);
                 displayBuffer->convertFromImage(qImageBuffer);
 
diff --git a/openbr/plugins/meta.cpp b/openbr/plugins/meta.cpp
index 4daacc3..dc2d6e9 100644
--- a/openbr/plugins/meta.cpp
+++ b/openbr/plugins/meta.cpp
@@ -667,7 +667,7 @@ public:
 
         QList<TemplateList> separated;
         foreach (const TemplateList &list, data) {
-            foreach(const Template &t, list) {
+            foreach (const Template &t, list) {
                 separated.append(TemplateList());
                 separated.last().append(t);
             }
diff --git a/openbr/plugins/misc.cpp b/openbr/plugins/misc.cpp
index e2f7c45..7748e55 100644
--- a/openbr/plugins/misc.cpp
+++ b/openbr/plugins/misc.cpp
@@ -525,7 +525,7 @@ class IncrementalOutputTransform : public TimeVaryingTransform
 
         dst = src;
         int idx =0;
-        foreach(const Template &t, src) {
+        foreach (const Template &t, src) {
             if (t.empty())
                 continue;
 
@@ -692,9 +692,8 @@ class OutputTransform : public TimeVaryingTransform
             return;
 
         // we received a template, which is the next row/column in order
-        foreach(const Template &t, dst) {
-            for (int i=0; i < t.m().cols; i++)
-            {
+        foreach (const Template &t, dst) {
+            for (int i=0; i < t.m().cols; i++) {
                 output->setRelative(t.m().at<float>(0, i), currentRow, currentCol);
 
                 // row-major input
@@ -718,21 +717,18 @@ class OutputTransform : public TimeVaryingTransform
 
         bool blockDone = false;
         // In direct mode, we don't buffer rows
-        if (!transposeMode)
-        {
+        if (!transposeMode) {
             currentBlockRow++;
             blockDone = true;
         }
         // in transpose mode, we buffer 100 cols before writing the block
-        else if (currentCol == bufferedSize)
-        {
+        else if (currentCol == bufferedSize) {
             currentBlockCol++;
             blockDone = true;
         }
         else return;
 
-        if (blockDone)
-        {
+        if (blockDone) {
             // set the next block, only necessary if we haven't buffered the current item
             output->setBlock(currentBlockRow, currentBlockCol);
             currentRow = 0;
@@ -761,15 +757,13 @@ class OutputTransform : public TimeVaryingTransform
 
         bufferedSize = 100;
 
-        if (transposeMode)
-        {
+        if (transposeMode) {
             // buffer 100 cols at a time
             fragmentsPerRow = bufferedSize;
             // a single col contains comparisons to all query files
             fragmentsPerCol = queryFiles.size();
         }
-        else
-        {
+        else {
             // a single row contains comparisons to all target files
             fragmentsPerRow = targetFiles.size();
             // we output rows one at a time
@@ -819,8 +813,7 @@ class FileExclusionTransform : public UntrainableMetaTransform
 
     void project(const TemplateList &src, TemplateList &dst) const
     {
-        foreach(const Template &srcTemp, src)
-        {
+        foreach (const Template &srcTemp, src) {
             if (!excluded.contains(srcTemp.file))
                 dst.append(srcTemp);
         }
diff --git a/openbr/plugins/openbr_internal.h b/openbr/plugins/openbr_internal.h
index 17ea22c..085a0d5 100644
--- a/openbr/plugins/openbr_internal.h
+++ b/openbr/plugins/openbr_internal.h
@@ -289,8 +289,7 @@ public:
         if (output == NULL)
             qFatal("Dynamic cast failed!");
 
-        foreach(Transform* t, transforms )
-        {
+        foreach (Transform* t, transforms ) {
             bool newItem = false;
             Transform *maybe_copy = t->smartCopy(newItem);
             if (newItem)
diff --git a/openbr/plugins/regions.cpp b/openbr/plugins/regions.cpp
index c6fe0e5..b00f544 100644
--- a/openbr/plugins/regions.cpp
+++ b/openbr/plugins/regions.cpp
@@ -324,7 +324,7 @@ class RectFromPointsTransform : public UntrainableTransform
 
         QList<QPointF> points;
 
-        foreach(int index, indices) {
+        foreach (int index, indices) {
             if (src.file.points().size() > index) {
                 if (src.file.points()[index].x() < minX) minX = src.file.points()[index].x();
                 if (src.file.points()[index].x() > maxX) maxX = src.file.points()[index].x();
diff --git a/openbr/plugins/stream.cpp b/openbr/plugins/stream.cpp
index f9acf83..d1efcda 100644
--- a/openbr/plugins/stream.cpp
+++ b/openbr/plugins/stream.cpp
@@ -1355,16 +1355,16 @@ public:
 
         // dst is set to all output received by the final stage, along
         // with anything output via the calls to finalize.
-        foreach(const TemplateList &list, collector->sets) {
+        foreach (const TemplateList &list, collector->sets)
             dst.append(list);
-        }
+
         collector->sets.clear();
 
         dst.append(final_output);
 
-        foreach(ProcessingStage *stage, processingStages) {
+        foreach (ProcessingStage *stage, processingStages)
             stage->reset();
-        }
+
     }
 
 
diff --git a/openbr/plugins/template.cpp b/openbr/plugins/template.cpp
index 34bd7e4..6e627eb 100644
--- a/openbr/plugins/template.cpp
+++ b/openbr/plugins/template.cpp
@@ -19,9 +19,9 @@ class KeepMetadataTransform : public UntrainableMetadataTransform
     void projectMetadata(const File &src, File &dst) const
     {
         dst = src;
-        foreach(const QString& localKey, dst.localKeys()) {
-            if (!keys.contains(localKey)) dst.remove(localKey);
-        }
+        foreach (const QString& localKey, dst.localKeys())
+            if (!keys.contains(localKey))
+                dst.remove(localKey);
     }
 };