diff --git a/FreeBSD.gni b/FreeBSD.gni
index 540b3e0..f217ca8 100644
--- a/FreeBSD.gni
+++ b/FreeBSD.gni
@@ -30,20 +30,20 @@ FREEBSD_SYS_LIBKERN_SRC_FILES = [ "//third_party/FreeBSD/sys/libkern/crc32.c" ]
 FREEBSD_DIR = get_path_info(".", "abspath")
 
 build_inherited_configs = [
-  "//build/config/compiler:afdo",
-  "//build/config/compiler:afdo_optimize_size",
-  "//build/config/compiler:compiler",
-  "//build/config/compiler:compiler_arm_fpu",
-  "//build/config/compiler:compiler_arm_thumb",
-  "//build/config/compiler:chromium_code",
-  "//build/config/compiler:default_include_dirs",
-  "//build/config/compiler:default_optimization",
-  "//build/config/compiler:default_stack_frames",
-  "//build/config/compiler:default_symbols",
-  "//build/config/compiler:export_dynamic",
   "//build/config/compiler:no_exceptions",
-  "//build/config/compiler:no_rtti",
+  "//build/config/compiler:export_dynamic",
   "//build/config/compiler:runtime_library",
+  "//build/config/compiler:no_rtti",
   "//build/config/compiler:thin_archive",
   "//build/config/sanitizers:default_sanitizer_flags",
+  "//build/config/compiler:default_symbols",
+  "//build/config/compiler:default_stack_frames",
+  "//build/config/compiler:default_optimization",
+  "//build/config/compiler:default_include_dirs",
+  "//build/config/compiler:chromium_code",
+  "//build/config/compiler:compiler_arm_thumb",
+  "//build/config/compiler:compiler_arm_fpu",
+  "//build/config/compiler:compiler",
+  "//build/config/compiler:afdo_optimize_size",
+  "//build/config/compiler:afdo",
 ]
diff --git a/bundle.json b/bundle.json
index 13db1a0..a205e80 100644
--- a/bundle.json
+++ b/bundle.json
@@ -34,17 +34,17 @@
                 {
                     "name": "//third_party/FreeBSD:libfreebsd_static"
                 },
-                {
-                    "name": "//third_party/FreeBSD/sbin/fsck_msdosfs:fsck_msdos"
-                },
-                {
-                    "name": "//third_party/FreeBSD/sbin/newfs_msdos:newfs_msdos"
-                },
                 {
                     "name": "//third_party/FreeBSD:ld128_static"
                 },
                 {
                     "name": "//third_party/FreeBSD:libc_static"
+                },
+                {
+                    "name": "//third_party/FreeBSD/sbin/fsck_msdosfs:fsck_msdos"
+                },
+                {
+                    "name": "//third_party/FreeBSD/sbin/newfs_msdos:newfs_msdos"
                 }
             ],
             "test": []
diff --git a/lib/libc/include/fpmath.h b/lib/libc/include/fpmath.h
index 507d708..3a4fa58 100755
--- a/lib/libc/include/fpmath.h
+++ b/lib/libc/include/fpmath.h
@@ -43,16 +43,15 @@
 union IEEEl2bits {
 	long double	e;
 	struct {
-		unsigned long	manl	:64;
-		unsigned long	manh	:48;
-		unsigned int	exp	:15;
-		unsigned int	sign	:1;
+		unsigned long	manl	: 64;
+		unsigned long	manh	: 48;
+		unsigned int	exp	: 15;
+		unsigned int	sign	: 1;
 	} bits;
-	/* TODO andrew: Check the packing here */
 	struct {
-		unsigned long	manl	:64;
-		unsigned long	manh	:48;
-		unsigned int	expsign	:16;
+		unsigned long	manl	: 64;
+		unsigned long	manh	: 48;
+		unsigned int	expsign	: 16;
 	} xbits;
 };
 
@@ -68,19 +67,19 @@ union IEEEl2bits {
 	(a)[1] = (uint32_t)((u).bits.manl >> 32);	\
 	(a)[2] = (uint32_t)(u).bits.manh;		\
 	(a)[3] = (uint32_t)((u).bits.manh >> 32);	\
-} while(0)
+} while (0)
 #else
 union IEEEf2bits {
 	float	f;
 	struct {
 #if __BYTE_ORDER == __LITTLE_ENDIAN
-		unsigned int	man	:23;
-		unsigned int	exp	:8;
-		unsigned int	sign	:1;
+		unsigned int	man	: 23;
+		unsigned int	exp	: 8;
+		unsigned int	sign	: 1;
 #else /* __BIG_ENDIAN */
-		unsigned int	sign	:1;
-		unsigned int	exp	:8;
-		unsigned int	man	:23;
+		unsigned int	sign	: 1;
+		unsigned int	exp	: 8;
+		unsigned int	man	: 23;
 #endif
 	} bits;
 };
@@ -93,21 +92,21 @@ union IEEEd2bits {
 	struct {
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 #if _IEEE_WORD_ORDER == __LITTLE_ENDIAN
-		unsigned int	manl	:32;
+		unsigned int	manl	: 32;
 #endif
-		unsigned int	manh	:20;
-		unsigned int	exp	:11;
-		unsigned int	sign	:1;
+		unsigned int	manh	: 20;
+		unsigned int	exp	: 11;
+		unsigned int	sign	: 1;
 #if _IEEE_WORD_ORDER == __BIG_ENDIAN
-		unsigned int	manl	:32;
+		unsigned int	manl	: 32;
 #endif
 #else /* __BIG_ENDIAN */
-		unsigned int	sign	:1;
-		unsigned int	exp	:11;
-		unsigned int	manh	:20;
-		unsigned int	manl	:32;
+		unsigned int	sign	: 1;
+		unsigned int	exp	: 11;
+		unsigned int	manh	: 20;
+		unsigned int	manl	: 32;
 #endif
 	} bits;
 };
 #endif
-#endif /* !_FPMATH_H */
\ No newline at end of file
+#endif /* !_FPMATH_H */