diff --git a/examples/for_each.c b/examples/for_each.c
index 6c1ecdb..07b9f3b 100644
--- a/examples/for_each.c
+++ b/examples/for_each.c
@@ -38,7 +38,7 @@ int main(int argc, char const *argv[])
     // - var : the elements that changes with each iteration
     // - index : iteration index (first iteration is 0 and last is count - 1)
     // - iter : iterator struct
-    FOR_EACH(l, list, , int, l, {
+    FOR_EACH(l, list, int, l, {
         if (index == 0)
             printf("[ %d, ", var);
         else if (index == iter.target->count - 1)
@@ -47,7 +47,7 @@ int main(int argc, char const *argv[])
             printf("%d, ", var);
     })
 
-    FOR_EACH(s, stack, , int, s, {
+    FOR_EACH(s, stack, int, s, {
         if (index == iter.target->count - 1)
             printf("[ %d, ", var);
         else if (index == 0)
@@ -56,7 +56,7 @@ int main(int argc, char const *argv[])
             printf("%d, ", var);
     })
 
-    FOR_EACH(q, queue, , int, q, {
+    FOR_EACH(q, queue, int, q, {
         if (index == 0)
             printf("[ %d, ", var);
         else if (index == iter.target->count - 1)
@@ -65,7 +65,7 @@ int main(int argc, char const *argv[])
             printf("%d, ", var);
     })
 
-    FOR_EACH(d, deque, , int, d, {
+    FOR_EACH(d, deque, int, d, {
         if (index == 0)
             printf("[ %d, ", var);
         else if (index == iter.target->count - 1)
diff --git a/src/foreach.h b/src/foreach.h
index 99d2c5f..1b43498 100644
--- a/src/foreach.h
+++ b/src/foreach.h
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 
-#define FOR_EACH(PFX, SNAME, K, V, TARGET, BODY)     \
+#define FOR_EACH(PFX, SNAME, V, TARGET, BODY)        \
     do                                               \
     {                                                \
         size_t index;                                \
@@ -27,7 +27,7 @@
         }                                            \
     } while (0);
 
-#define FOR_EACH_REV(PFX, SNAME, K, V, TARGET, BODY) \
+#define FOR_EACH_REV(PFX, SNAME, V, TARGET, BODY)    \
     do                                               \
     {                                                \
         size_t index;                                \
diff --git a/tests/foreach.c b/tests/foreach.c
index 0b5d74b..fcc1082 100644
--- a/tests/foreach.c
+++ b/tests/foreach.c
@@ -48,31 +48,31 @@ int main(int argc, char const *argv[])
 
     int sum0 = 0, sum1 = 0, sum2 = 0, sum3 = 0, sum4 = 0, sum5 = 0, sum6 = 0;
 
-    FOR_EACH(l, list, , int, l, {
+    FOR_EACH(l, list, int, l, {
         sum0 += var;
     })
 
-    FOR_EACH(s, stack, , int, s, {
+    FOR_EACH(s, stack, int, s, {
         sum1 += var;
     })
 
-    FOR_EACH(q, queue, , int, q, {
+    FOR_EACH(q, queue, int, q, {
         sum2 += var;
     })
 
-    FOR_EACH(d, deque, , int, d, {
+    FOR_EACH(d, deque, int, d, {
         sum3 += var;
     })
 
-    FOR_EACH(ll, linked, , int, ll, {
+    FOR_EACH(ll, linked, int, ll, {
         sum4 += var;
     })
 
-    FOR_EACH(h, heap, , int, h, {
+    FOR_EACH(h, heap, int, h, {
         sum5 += var;
     })
 
-    FOR_EACH(ts, tset, , int, ts, {
+    FOR_EACH(ts, tset, int, ts, {
         sum6 += var;
     })
 
@@ -95,31 +95,31 @@ int main(int argc, char const *argv[])
 
     sum0 = 0, sum1 = 0, sum2 = 0, sum3 = 0, sum4 = 0, sum5 = 0, sum6 = 0;
 
-    FOR_EACH_REV(l, list, , int, l, {
+    FOR_EACH_REV(l, list, int, l, {
         sum0 += var;
     })
 
-    FOR_EACH_REV(s, stack, , int, s, {
+    FOR_EACH_REV(s, stack, int, s, {
         sum1 += var;
     })
 
-    FOR_EACH_REV(q, queue, , int, q, {
+    FOR_EACH_REV(q, queue, int, q, {
         sum2 += var;
     })
 
-    FOR_EACH_REV(d, deque, , int, d, {
+    FOR_EACH_REV(d, deque, int, d, {
         sum3 += var;
     })
 
-    FOR_EACH_REV(ll, linked, , int, ll, {
+    FOR_EACH_REV(ll, linked, int, ll, {
         sum4 += var;
     })
 
-    FOR_EACH_REV(h, heap, , int, h, {
+    FOR_EACH_REV(h, heap, int, h, {
         sum5 += var;
     })
 
-    FOR_EACH_REV(ts, tset, , int, ts, {
+    FOR_EACH_REV(ts, tset, int, ts, {
         sum6 += var;
     })