diff --git a/common/endian.h b/common/endian.h
index 791880b..3c4269b 100644
--- a/common/endian.h
+++ b/common/endian.h
@@ -3,43 +3,43 @@
 
 #ifdef __APPLE__
 # include <machine/endian.h>
-#elif defined( __linux__ ) || defined( __CYGWIN__ ) || defined( __OpenBSD__ )
+#elif defined(__linux__) || defined(__CYGWIN__) || defined(__OpenBSD__)
 # include <endian.h>
-#elif defined( __NetBSD__ ) || defined( __FreeBSD__ ) || defined( __DragonFly__ )
+#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
 # include <sys/endian.h>
 # ifdef __FreeBSD__
 #  define LITTLE_ENDIAN _LITTLE_ENDIAN
 #  define BIG_ENDIAN    _BIG_ENDIAN
 #  define BYTE_ORDER    _BYTE_ORDER
 # endif
-#elif defined( _MSC_VER ) || defined( _WIN16 ) || defined( _WIN32 ) || defined( _WIN64 )
+#elif defined(_MSC_VER) || defined(_WIN16) || defined(_WIN32) || defined(_WIN64)
 # ifdef _MSC_VER
 #  define LITTLE_ENDIAN 1234
 #  define BIG_ENDIAN    4321
-#  if defined( _M_IX86 ) || defined( _M_X64 ) || defined( _M_AMD64 ) || defined( _M_IA64 )
+#  if defined(_M_IX86) || defined(_M_X64) || defined(_M_AMD64) || defined(_M_IA64)
 #   define BYTE_ORDER LITTLE_ENDIAN
-#  elif defined( _M_PPC )
+#  elif defined(_M_PPC)
 // Probably not reliable but eh
 #   define BYTE_ORDER BIG_ENDIAN
 #  endif
-# elif defined( __GNUC__ )
+# elif defined(__GNUC__)
 #  include <sys/param.h>
 # endif
 #endif
 
-#if !defined( BYTE_ORDER ) || !defined( LITTLE_ENDIAN ) || !defined( BIG_ENDIAN ) || \
-    !( BYTE_ORDER == LITTLE_ENDIAN || BYTE_ORDER == BIG_ENDIAN )
+#if !defined(BYTE_ORDER) || !defined(LITTLE_ENDIAN) || !defined(BIG_ENDIAN) || \
+    !(BYTE_ORDER == LITTLE_ENDIAN || BYTE_ORDER == BIG_ENDIAN)
 # error "Couldn't determine endianness or unsupported platform"
 #endif
 
 #ifdef _MSC_VER
 # define swap32(X) _byteswap_ulong((X))
 # define swap16(X) _byteswap_ushort((X))
-#elif ( __GNUC__ == 4 && __GNUC_MINOR__ >= 8 ) || ( __GNUC__ > 4 )
+#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 8) || (__GNUC__ > 4)
 # define swap32(X) __builtin_bswap32((X))
 # define swap16(X) __builtin_bswap16((X))
 // Apparently smelly GCC 5 blows up on this test so this is done separately for Clang
-#elif defined( __has_builtin ) && __has_builtin( __builtin_bswap32 ) && __has_builtin( __builtin_bswap16 )
+#elif defined(__has_builtin) && __has_builtin(__builtin_bswap32) && __has_builtin(__builtin_bswap16)
 # define swap32(X) __builtin_bswap32((X))
 # define swap16(X) __builtin_bswap16((X))
 #else
diff --git a/common/util.h b/common/util.h
index 01616aa..6e5f20d 100644
--- a/common/util.h
+++ b/common/util.h
@@ -5,9 +5,9 @@
 #define MAX(A, B) (((A) > (B)) ? (A) : (B))
 #define CLAMP(X, A, B) (MIN(MAX((X), (A)), (B)))
 
-#if ( defined( __GNUC__ ) && ( __GNUC__ >= 4 ) ) || defined( __clang__ )
+#if (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__)
 # define FORCE_INLINE inline __attribute__((always_inline))
-#elif defined( _MSC_VER )
+#elif defined(_MSC_VER)
 # define FORCE_INLINE __forceinline
 #else
 # define FORCE_INLINE inline