diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk
index 78af2f4..a25026f 100644
--- a/bluejay/BoardConfig.mk
+++ b/bluejay/BoardConfig.mk
@@ -5,30 +5,33 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# Enable load module in parallel
+TARGET_BOARD_INFO_FILE := $(DEVICE_PATH)/board-info.txt
+TARGET_BOOTLOADER_BOARD_NAME := $(DEVICE_CODENAME)
+TARGET_SCREEN_DENSITY := 420
+
+include device/google/gs101/BoardConfig-common.mk
+
+# Kernel
+BOARD_KERNEL_CMDLINE += disable_dma32=on
+
+# Kernel modules
 BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
 
-# The modules which need to be loaded in sequential
 BOARD_KERNEL_CMDLINE += fips140.load_sequential=1
 BOARD_KERNEL_CMDLINE += exynos_mfc.load_sequential=1
 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
 BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1
 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1
 
-TARGET_BOARD_INFO_FILE := device/google/bluejay/board-info.txt
-TARGET_BOOTLOADER_BOARD_NAME := bluejay
-TARGET_SCREEN_DENSITY := 420
-
-BOARD_KERNEL_CMDLINE += disable_dma32=on
-
-include device/google/gs101/BoardConfig-common.mk
-include device/google/bluejay/sepolicy/bluejay-sepolicy.mk
-include device/google/gs101/wifi/BoardConfig-wifi.mk
-
-# Kernel modules
 BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_BLOCKLIST_FILE := $(DEVICE_PATH)/recovery/modules.blocklist.vendor_boot
 BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW := $(strip $(shell cat $(DEVICE_PATH)/recovery/modules.load.vendor_boot))
 BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD += $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW)
 BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW)))
 
+# SEPolicy
+include device/google/bluejay/sepolicy/bluejay-sepolicy.mk
+
+# WiFi
+include device/google/gs101/wifi/BoardConfig-wifi.mk
+
 include $(VENDOR_PATH)/BoardConfigVendor.mk