diff --git a/src/iptc.cpp b/src/iptc.cpp
index 26ea545c..ceeb0450 100644
--- a/src/iptc.cpp
+++ b/src/iptc.cpp
@@ -498,14 +498,14 @@ namespace Exiv2 {
         std::copy(iptcData.begin(), iptcData.end(), std::back_inserter(sortedIptcData));
         std::stable_sort(sortedIptcData.begin(), sortedIptcData.end(), cmpIptcdataByRecord);
 
-        for (auto iter = sortedIptcData.cbegin() ; iter != sortedIptcData.cend(); ++iter) {
+        for (const auto& iter : sortedIptcData) {
             // marker, record Id, dataset num
             *pWrite++ = marker_;
-            *pWrite++ = static_cast<byte>(iter->record());
-            *pWrite++ = static_cast<byte>(iter->tag());
+            *pWrite++ = static_cast<byte>(iter.record());
+            *pWrite++ = static_cast<byte>(iter.tag());
 
             // extended or standard dataset?
-            long dataSize = iter->size();
+            long dataSize = iter.size();
             if (dataSize > 32767) {
                 // always use 4 bytes for extended length
                 uint16_t sizeOfSize = 4 | 0x8000;
@@ -518,7 +518,7 @@ namespace Exiv2 {
                 us2Data(pWrite, static_cast<uint16_t>(dataSize), bigEndian);
                 pWrite += 2;
             }
-            pWrite += iter->value().copy(pWrite, bigEndian);
+            pWrite += iter.value().copy(pWrite, bigEndian);
         }
 
         return buf;
diff --git a/unitTests/test_safe_op.cpp b/unitTests/test_safe_op.cpp
index c44b1f3d..627283b5 100644
--- a/unitTests/test_safe_op.cpp
+++ b/unitTests/test_safe_op.cpp
@@ -186,8 +186,8 @@ TEST(safeAdd, checkSignedOverflow)
 TEST(safeAbs, checkValues)
 {
     static const int values[] = {-1, 1, std::numeric_limits<int>::max(), std::numeric_limits<int>::min() + 1};
-    for (size_t i = 0; i < sizeof(values) / sizeof(*values); ++i) {
-        ASSERT_EQ(Safe::abs(values[i]), abs(values[i]));
+    for (int value : values) {
+        ASSERT_EQ(Safe::abs(value), abs(value));
     }
     ASSERT_EQ(Safe::abs(std::numeric_limits<int>::min()), std::numeric_limits<int>::max());
 }
diff --git a/unitTests/test_types.cpp b/unitTests/test_types.cpp
index 799b9752..2da0b187 100644
--- a/unitTests/test_types.cpp
+++ b/unitTests/test_types.cpp
@@ -76,10 +76,10 @@ TEST(Rational, floatToRationalCast)
 {
     static const float floats[] = {0.5F, 0.015F, 0.0000625F};
 
-    for (size_t i = 0; i < sizeof(floats) / sizeof(*floats); ++i) {
-        const Rational r = floatToRationalCast(floats[i]);
+    for (float i : floats) {
+        const Rational r = floatToRationalCast(i);
         const float fraction = static_cast<float>(r.first) / static_cast<float>(r.second);
-        ASSERT_TRUE(std::fabs((floats[i] - fraction) / floats[i]) < 0.01F);
+        ASSERT_TRUE(std::fabs((i - fraction) / i) < 0.01F);
     }
 
     const Rational plus_inf = floatToRationalCast(std::numeric_limits<float>::infinity());