diff --git a/contrib/win32/stdlib.c b/contrib/win32/stdlib.c
index c1edfe8..87cbd4e 100644
--- a/contrib/win32/stdlib.c
+++ b/contrib/win32/stdlib.c
@@ -29,10 +29,8 @@
 int setenv(const char *name, const char *value, int overwrite)
 {
   int exists = GetEnvironmentVariableA(name, NULL, 0);
-  if ((exists && overwrite) || (!exists))
-  {
-    if (!SetEnvironmentVariableA(name, value))
-    {
+  if ((exists && overwrite) || (!exists)) {
+    if (!SetEnvironmentVariableA(name, value)) {
       // Set errno here correctly
       return -1;
     }
diff --git a/contrib/win32/unistd.h b/contrib/win32/unistd.h
index 851dc60..89aeda8 100644
--- a/contrib/win32/unistd.h
+++ b/contrib/win32/unistd.h
@@ -33,7 +33,7 @@
 
 // With MinGW, getopt(3) is provided as separate header
 #if defined(WIN32) && defined(__GNUC__) /* mingw compiler */
- #include <getopt.h>
+#include <getopt.h>
 #endif
 
 
diff --git a/contrib/windows.h b/contrib/windows.h
index 52d936b..2384d59 100644
--- a/contrib/windows.h
+++ b/contrib/windows.h
@@ -45,7 +45,7 @@
 #    define strdup _strdup
 #  endif
 
-/* 
+/*
  * setenv and unsetenv are not Windows compliant nor implemented in MinGW.
  * These declarations get rid of the "implicit declaration warning."
  */
diff --git a/libnfc/log-printf.c b/libnfc/log-printf.c
index 75c5e27..c2feaf9 100644
--- a/libnfc/log-printf.c
+++ b/libnfc/log-printf.c
@@ -26,9 +26,9 @@
 #include <fcntl.h>
 
 #ifndef LOG
- // Leaving in a preprocessor error, as the build system should skip this
- // file otherwise.
- #error "No logging defined, but log-printf.c still compiled."
+// Leaving in a preprocessor error, as the build system should skip this
+// file otherwise.
+#error "No logging defined, but log-printf.c still compiled."
 #else // LOG
 
 void