diff --git a/crypto_kem/frodokem1344aes/clean/util.c b/crypto_kem/frodokem1344aes/clean/util.c
index a64b32d6..ab565fca 100644
--- a/crypto_kem/frodokem1344aes/clean/util.c
+++ b/crypto_kem/frodokem1344aes/clean/util.c
@@ -12,8 +12,10 @@
 #include "params.h"
 
 static inline uint8_t min(uint8_t x, uint8_t y) {
-  if (x < y) return x;
-  return y;
+    if (x < y) {
+        return x;
+    }
+    return y;
 }
 
 uint16_t PQCLEAN_FRODOKEM1344AES_CLEAN_LE_TO_UINT16(uint16_t n) {
diff --git a/crypto_kem/frodokem1344aes/opt/util.c b/crypto_kem/frodokem1344aes/opt/util.c
index 7a0bb5fe..9e617aa3 100644
--- a/crypto_kem/frodokem1344aes/opt/util.c
+++ b/crypto_kem/frodokem1344aes/opt/util.c
@@ -12,8 +12,10 @@
 #include "params.h"
 
 static inline uint8_t min(uint8_t x, uint8_t y) {
-  if (x < y) return x;
-  return y;
+    if (x < y) {
+        return x;
+    }
+    return y;
 }
 
 uint16_t PQCLEAN_FRODOKEM1344AES_OPT_LE_TO_UINT16(uint16_t n) {
diff --git a/crypto_kem/frodokem1344shake/clean/util.c b/crypto_kem/frodokem1344shake/clean/util.c
index e0d9a24a..c8b24c85 100644
--- a/crypto_kem/frodokem1344shake/clean/util.c
+++ b/crypto_kem/frodokem1344shake/clean/util.c
@@ -12,8 +12,10 @@
 #include "params.h"
 
 static inline uint8_t min(uint8_t x, uint8_t y) {
-  if (x < y) return x;
-  return y;
+    if (x < y) {
+        return x;
+    }
+    return y;
 }
 
 uint16_t PQCLEAN_FRODOKEM1344SHAKE_CLEAN_LE_TO_UINT16(uint16_t n) {
diff --git a/crypto_kem/frodokem1344shake/opt/util.c b/crypto_kem/frodokem1344shake/opt/util.c
index 021f76a0..6f6e8d66 100644
--- a/crypto_kem/frodokem1344shake/opt/util.c
+++ b/crypto_kem/frodokem1344shake/opt/util.c
@@ -12,8 +12,10 @@
 #include "params.h"
 
 static inline uint8_t min(uint8_t x, uint8_t y) {
-  if (x < y) return x;
-  return y;
+    if (x < y) {
+        return x;
+    }
+    return y;
 }
 
 uint16_t PQCLEAN_FRODOKEM1344SHAKE_OPT_LE_TO_UINT16(uint16_t n) {
diff --git a/crypto_kem/frodokem640aes/clean/util.c b/crypto_kem/frodokem640aes/clean/util.c
index a31a9cf8..bdba92e0 100644
--- a/crypto_kem/frodokem640aes/clean/util.c
+++ b/crypto_kem/frodokem640aes/clean/util.c
@@ -12,8 +12,10 @@
 #include "params.h"
 
 static inline uint8_t min(uint8_t x, uint8_t y) {
-  if (x < y) return x;
-  return y;
+    if (x < y) {
+        return x;
+    }
+    return y;
 }
 
 uint16_t PQCLEAN_FRODOKEM640AES_CLEAN_LE_TO_UINT16(uint16_t n) {
diff --git a/crypto_kem/frodokem640aes/opt/util.c b/crypto_kem/frodokem640aes/opt/util.c
index 79b98c5e..5cdd6ca3 100644
--- a/crypto_kem/frodokem640aes/opt/util.c
+++ b/crypto_kem/frodokem640aes/opt/util.c
@@ -12,8 +12,10 @@
 #include "params.h"
 
 static inline uint8_t min(uint8_t x, uint8_t y) {
-  if (x < y) return x;
-  return y;
+    if (x < y) {
+        return x;
+    }
+    return y;
 }
 
 uint16_t PQCLEAN_FRODOKEM640AES_OPT_LE_TO_UINT16(uint16_t n) {
diff --git a/crypto_kem/frodokem640shake/clean/util.c b/crypto_kem/frodokem640shake/clean/util.c
index 23e10e90..ace911bd 100644
--- a/crypto_kem/frodokem640shake/clean/util.c
+++ b/crypto_kem/frodokem640shake/clean/util.c
@@ -12,8 +12,10 @@
 #include "params.h"
 
 static inline uint8_t min(uint8_t x, uint8_t y) {
-  if (x < y) return x;
-  return y;
+    if (x < y) {
+        return x;
+    }
+    return y;
 }
 
 uint16_t PQCLEAN_FRODOKEM640SHAKE_CLEAN_LE_TO_UINT16(uint16_t n) {
diff --git a/crypto_kem/frodokem640shake/opt/util.c b/crypto_kem/frodokem640shake/opt/util.c
index 328af730..1b3a5825 100644
--- a/crypto_kem/frodokem640shake/opt/util.c
+++ b/crypto_kem/frodokem640shake/opt/util.c
@@ -12,8 +12,10 @@
 #include "params.h"
 
 static inline uint8_t min(uint8_t x, uint8_t y) {
-  if (x < y) return x;
-  return y;
+    if (x < y) {
+        return x;
+    }
+    return y;
 }
 
 uint16_t PQCLEAN_FRODOKEM640SHAKE_OPT_LE_TO_UINT16(uint16_t n) {
diff --git a/crypto_kem/frodokem976aes/clean/util.c b/crypto_kem/frodokem976aes/clean/util.c
index 388aac89..c8a76b81 100644
--- a/crypto_kem/frodokem976aes/clean/util.c
+++ b/crypto_kem/frodokem976aes/clean/util.c
@@ -12,8 +12,10 @@
 #include "params.h"
 
 static inline uint8_t min(uint8_t x, uint8_t y) {
-  if (x < y) return x;
-  return y;
+    if (x < y) {
+        return x;
+    }
+    return y;
 }
 
 uint16_t PQCLEAN_FRODOKEM976AES_CLEAN_LE_TO_UINT16(uint16_t n) {
diff --git a/crypto_kem/frodokem976aes/opt/util.c b/crypto_kem/frodokem976aes/opt/util.c
index cad5636c..cac6b449 100644
--- a/crypto_kem/frodokem976aes/opt/util.c
+++ b/crypto_kem/frodokem976aes/opt/util.c
@@ -12,8 +12,10 @@
 #include "params.h"
 
 static inline uint8_t min(uint8_t x, uint8_t y) {
-  if (x < y) return x;
-  return y;
+    if (x < y) {
+        return x;
+    }
+    return y;
 }
 
 uint16_t PQCLEAN_FRODOKEM976AES_OPT_LE_TO_UINT16(uint16_t n) {
diff --git a/crypto_kem/frodokem976shake/clean/util.c b/crypto_kem/frodokem976shake/clean/util.c
index 4f2b0bf2..8360be6d 100644
--- a/crypto_kem/frodokem976shake/clean/util.c
+++ b/crypto_kem/frodokem976shake/clean/util.c
@@ -12,8 +12,10 @@
 #include "params.h"
 
 static inline uint8_t min(uint8_t x, uint8_t y) {
-  if (x < y) return x;
-  return y;
+    if (x < y) {
+        return x;
+    }
+    return y;
 }
 
 uint16_t PQCLEAN_FRODOKEM976SHAKE_CLEAN_LE_TO_UINT16(uint16_t n) {
diff --git a/crypto_kem/frodokem976shake/opt/util.c b/crypto_kem/frodokem976shake/opt/util.c
index 4bd77615..83677f28 100644
--- a/crypto_kem/frodokem976shake/opt/util.c
+++ b/crypto_kem/frodokem976shake/opt/util.c
@@ -12,8 +12,10 @@
 #include "params.h"
 
 static inline uint8_t min(uint8_t x, uint8_t y) {
-  if (x < y) return x;
-  return y;
+    if (x < y) {
+        return x;
+    }
+    return y;
 }
 
 uint16_t PQCLEAN_FRODOKEM976SHAKE_OPT_LE_TO_UINT16(uint16_t n) {
diff --git a/crypto_kem/mceliece348864/avx/int32_sort.c b/crypto_kem/mceliece348864/avx/int32_sort.c
index 54295975..f984819f 100644
--- a/crypto_kem/mceliece348864/avx/int32_sort.c
+++ b/crypto_kem/mceliece348864/avx/int32_sort.c
@@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, size_t n, int flagdown) {
 
             q = n >> 3;
             flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
             for (j = 0; j < q; j += p + p) {
                 for (k = j; k < j + p + p; k += p) {
                     for (i = k; i < k + p; i += 8) {
diff --git a/crypto_kem/mceliece348864f/avx/int32_sort.c b/crypto_kem/mceliece348864f/avx/int32_sort.c
index a282f5c2..3d00867d 100644
--- a/crypto_kem/mceliece348864f/avx/int32_sort.c
+++ b/crypto_kem/mceliece348864f/avx/int32_sort.c
@@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, size_t n, int flagdown) {
 
             q = n >> 3;
             flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
             for (j = 0; j < q; j += p + p) {
                 for (k = j; k < j + p + p; k += p) {
                     for (i = k; i < k + p; i += 8) {
diff --git a/crypto_kem/mceliece460896/avx/int32_sort.c b/crypto_kem/mceliece460896/avx/int32_sort.c
index cdddf86a..aae917bd 100644
--- a/crypto_kem/mceliece460896/avx/int32_sort.c
+++ b/crypto_kem/mceliece460896/avx/int32_sort.c
@@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, size_t n, int flagdown) {
 
             q = n >> 3;
             flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
             for (j = 0; j < q; j += p + p) {
                 for (k = j; k < j + p + p; k += p) {
                     for (i = k; i < k + p; i += 8) {
diff --git a/crypto_kem/mceliece460896f/avx/int32_sort.c b/crypto_kem/mceliece460896f/avx/int32_sort.c
index cc7e347a..d8c2b1c8 100644
--- a/crypto_kem/mceliece460896f/avx/int32_sort.c
+++ b/crypto_kem/mceliece460896f/avx/int32_sort.c
@@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, size_t n, int flagdown) {
 
             q = n >> 3;
             flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
             for (j = 0; j < q; j += p + p) {
                 for (k = j; k < j + p + p; k += p) {
                     for (i = k; i < k + p; i += 8) {
diff --git a/crypto_kem/mceliece6688128/avx/int32_sort.c b/crypto_kem/mceliece6688128/avx/int32_sort.c
index da5f0e57..d55525e7 100644
--- a/crypto_kem/mceliece6688128/avx/int32_sort.c
+++ b/crypto_kem/mceliece6688128/avx/int32_sort.c
@@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, size_t n, int flagdown) {
 
             q = n >> 3;
             flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
             for (j = 0; j < q; j += p + p) {
                 for (k = j; k < j + p + p; k += p) {
                     for (i = k; i < k + p; i += 8) {
diff --git a/crypto_kem/mceliece6688128f/avx/int32_sort.c b/crypto_kem/mceliece6688128f/avx/int32_sort.c
index 02bf18bb..f70f51dd 100644
--- a/crypto_kem/mceliece6688128f/avx/int32_sort.c
+++ b/crypto_kem/mceliece6688128f/avx/int32_sort.c
@@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, size_t n, int flagdown) {
 
             q = n >> 3;
             flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
             for (j = 0; j < q; j += p + p) {
                 for (k = j; k < j + p + p; k += p) {
                     for (i = k; i < k + p; i += 8) {
diff --git a/crypto_kem/mceliece6960119/avx/int32_sort.c b/crypto_kem/mceliece6960119/avx/int32_sort.c
index 270ba5b6..02087a3e 100644
--- a/crypto_kem/mceliece6960119/avx/int32_sort.c
+++ b/crypto_kem/mceliece6960119/avx/int32_sort.c
@@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, size_t n, int flagdown) {
 
             q = n >> 3;
             flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
             for (j = 0; j < q; j += p + p) {
                 for (k = j; k < j + p + p; k += p) {
                     for (i = k; i < k + p; i += 8) {
diff --git a/crypto_kem/mceliece6960119f/avx/int32_sort.c b/crypto_kem/mceliece6960119f/avx/int32_sort.c
index fdfc419d..73bf75a2 100644
--- a/crypto_kem/mceliece6960119f/avx/int32_sort.c
+++ b/crypto_kem/mceliece6960119f/avx/int32_sort.c
@@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, size_t n, int flagdown) {
 
             q = n >> 3;
             flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
             for (j = 0; j < q; j += p + p) {
                 for (k = j; k < j + p + p; k += p) {
                     for (i = k; i < k + p; i += 8) {
diff --git a/crypto_kem/mceliece8192128/avx/int32_sort.c b/crypto_kem/mceliece8192128/avx/int32_sort.c
index 145dfa8e..0e11f1c4 100644
--- a/crypto_kem/mceliece8192128/avx/int32_sort.c
+++ b/crypto_kem/mceliece8192128/avx/int32_sort.c
@@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, size_t n, int flagdown) {
 
             q = n >> 3;
             flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
             for (j = 0; j < q; j += p + p) {
                 for (k = j; k < j + p + p; k += p) {
                     for (i = k; i < k + p; i += 8) {
diff --git a/crypto_kem/mceliece8192128f/avx/int32_sort.c b/crypto_kem/mceliece8192128f/avx/int32_sort.c
index e5942540..a35e886e 100644
--- a/crypto_kem/mceliece8192128f/avx/int32_sort.c
+++ b/crypto_kem/mceliece8192128f/avx/int32_sort.c
@@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, size_t n, int flagdown) {
 
             q = n >> 3;
             flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
             for (j = 0; j < q; j += p + p) {
                 for (k = j; k < j + p + p; k += p) {
                     for (i = k; i < k + p; i += 8) {
diff --git a/crypto_kem/ntrulpr653/avx2/crypto_sort_int32.c b/crypto_kem/ntrulpr653/avx2/crypto_sort_int32.c
index f54b8934..c116c03d 100644
--- a/crypto_kem/ntrulpr653/avx2/crypto_sort_int32.c
+++ b/crypto_kem/ntrulpr653/avx2/crypto_sort_int32.c
@@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, long long n, int flagdown) {
 
             q = n >> 3;
             flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
             for (j = 0; j < q; j += p + p) {
                 for (k = j; k < j + p + p; k += p) {
                     for (i = k; i < k + p; i += 8) {
diff --git a/crypto_kem/ntrulpr761/avx2/crypto_sort_int32.c b/crypto_kem/ntrulpr761/avx2/crypto_sort_int32.c
index bcac3bb9..9340fb5b 100644
--- a/crypto_kem/ntrulpr761/avx2/crypto_sort_int32.c
+++ b/crypto_kem/ntrulpr761/avx2/crypto_sort_int32.c
@@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, long long n, int flagdown) {
 
             q = n >> 3;
             flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
             for (j = 0; j < q; j += p + p) {
                 for (k = j; k < j + p + p; k += p) {
                     for (i = k; i < k + p; i += 8) {
diff --git a/crypto_kem/ntrulpr857/avx2/crypto_sort_int32.c b/crypto_kem/ntrulpr857/avx2/crypto_sort_int32.c
index d6563d78..0b82a5d1 100644
--- a/crypto_kem/ntrulpr857/avx2/crypto_sort_int32.c
+++ b/crypto_kem/ntrulpr857/avx2/crypto_sort_int32.c
@@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, long long n, int flagdown) {
 
             q = n >> 3;
             flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
             for (j = 0; j < q; j += p + p) {
                 for (k = j; k < j + p + p; k += p) {
                     for (i = k; i < k + p; i += 8) {
diff --git a/crypto_kem/sntrup653/avx2/crypto_sort_int32.c b/crypto_kem/sntrup653/avx2/crypto_sort_int32.c
index de880bf7..289bc6b0 100644
--- a/crypto_kem/sntrup653/avx2/crypto_sort_int32.c
+++ b/crypto_kem/sntrup653/avx2/crypto_sort_int32.c
@@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, long long n, int flagdown) {
 
             q = n >> 3;
             flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
             for (j = 0; j < q; j += p + p) {
                 for (k = j; k < j + p + p; k += p) {
                     for (i = k; i < k + p; i += 8) {
diff --git a/crypto_kem/sntrup761/avx2/crypto_sort_int32.c b/crypto_kem/sntrup761/avx2/crypto_sort_int32.c
index 9c3b88c3..a3268aef 100644
--- a/crypto_kem/sntrup761/avx2/crypto_sort_int32.c
+++ b/crypto_kem/sntrup761/avx2/crypto_sort_int32.c
@@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, long long n, int flagdown) {
 
             q = n >> 3;
             flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
             for (j = 0; j < q; j += p + p) {
                 for (k = j; k < j + p + p; k += p) {
                     for (i = k; i < k + p; i += 8) {
diff --git a/crypto_kem/sntrup857/avx2/crypto_sort_int32.c b/crypto_kem/sntrup857/avx2/crypto_sort_int32.c
index 6879a1d3..bd96995a 100644
--- a/crypto_kem/sntrup857/avx2/crypto_sort_int32.c
+++ b/crypto_kem/sntrup857/avx2/crypto_sort_int32.c
@@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, long long n, int flagdown) {
 
             q = n >> 3;
             flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
             for (j = 0; j < q; j += p + p) {
                 for (k = j; k < j + p + p; k += p) {
                     for (i = k; i < k + p; i += 8) {