diff --git a/core.h b/core.h
index 95283c2..5e81307 100644
--- a/core.h
+++ b/core.h
@@ -27,11 +27,11 @@ typedef double             F64;
 
 /* ---- Clamps, Min/Max ------------------------------------------------ */
 
-#define MIN(A,B) (((A)<(B)) ? (A) : (B))
-#define MAX(A,B) (((A)>(B)) ? (A) : (B))
-#define CLAMP_TOP(A,X) Min(A,X)
-#define CLAMP_BOT(X,B) Max(X,B)
-#define CLAMP(A,X,B) (((X)<(A)) ? (A) : ((X)>(B)) ? (B) : (X))
+#define MIN(A,B) (((A) < (B)) ? (A) : (B))
+#define MAX(A,B) (((A) > (B)) ? (A) : (B))
+#define CLAMP_TOP(A, X) Min(A, X)
+#define CLAMP_BOT(X, B) Max(X, B)
+#define CLAMP(A, X, B) (((X) < (A)) ? (A) : ((X) > (B)) ? (B) : (X))
 
 /* ---- Asserts -------------------------------------------------------- */
 
@@ -54,11 +54,11 @@ typedef double             F64;
 
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 
-#define SWAP(T, a, b) do{ T t__ = a; a = b; b = t__; } while(0)
+#define SWAP(T, a, b) do { T t__ = a; a = b; b = t__; } while(0)
 
 /* ---- Constants ------------------------------------------------------ */
 
-#define PI 3.14159265358979323846 
+#define PI 3.14159265358979323846
 
 #define MAX_U64 (U64)0xffffffffffffffff
 #define MAX_U32 (U32)0xffffffff