diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 48eeb79..cab84fd 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -1,32 +1,32 @@
 # CEC
-/dev/cec0                                                                    u:object_r:cec_device:s0
-/dev/cec1                                                                    u:object_r:cec_device:s0
+/dev/cec0  u:object_r:cec_device:s0
+/dev/cec1  u:object_r:cec_device:s0
 
 # DRM
-/data/vendor/mediadrm(/.*)?                                                  u:object_r:mediadrm_vendor_data_file:s0
+/data/vendor/mediadrm(/.*)?  u:object_r:mediadrm_vendor_data_file:s0
 
 # FFmpeg
-/vendor/bin/hw/android\.hardware\.media\.c2@1\.2-service-ffmpeg              u:object_r:mediacodec_exec:s0
+/vendor/bin/hw/android\.hardware\.media\.c2@1\.2-service-ffmpeg  u:object_r:mediacodec_exec:s0
 
 # Graphics
-/dev/dri(/.*)?                                                                          u:object_r:gpu_device:s0
-/vendor/bin/hw/android\.hardware\.graphics\.allocator-service\.minigbm_gbm_mesa         u:object_r:hal_graphics_allocator_default_exec:s0
-/vendor/lib(64)?/hw/mapper\.minigbm_gbm_mesa\.so                                        u:object_r:same_process_hal_file:s0
-/vendor/lib(64)?/hw/vulkan\.broadcom\.so                                                u:object_r:same_process_hal_file:s0
-/vendor/lib(64)?/dri_gbm\.so                                                            u:object_r:same_process_hal_file:s0
-/vendor/lib(64)?/libdrm\.so                                                             u:object_r:same_process_hal_file:s0
-/vendor/lib(64)?/libgallium_dri\.so                                                     u:object_r:same_process_hal_file:s0
-/vendor/lib(64)?/libgbm_mesa\.so                                                        u:object_r:same_process_hal_file:s0
-/vendor/lib(64)?/libgbm_mesa_wrapper\.so                                                u:object_r:same_process_hal_file:s0
-/vendor/lib(64)?/libminigbm_gralloc_gbm_mesa\.so                                        u:object_r:same_process_hal_file:s0
-/vendor/lib(64)?/libminigbm_gralloc4_utils_gbm_mesa\.so                                 u:object_r:same_process_hal_file:s0
-/vendor/lib(64)?/libui\.so                                                              u:object_r:same_process_hal_file:s0
+/dev/dri(/.*)?                                                                   u:object_r:gpu_device:s0
+/vendor/bin/hw/android\.hardware\.graphics\.allocator-service\.minigbm_gbm_mesa  u:object_r:hal_graphics_allocator_default_exec:s0
+/vendor/lib(64)?/hw/mapper\.minigbm_gbm_mesa\.so                                 u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/hw/vulkan\.broadcom\.so                                         u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/dri_gbm\.so                                                     u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/libdrm\.so                                                      u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/libgallium_dri\.so                                              u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/libgbm_mesa\.so                                                 u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/libgbm_mesa_wrapper\.so                                         u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/libminigbm_gralloc_gbm_mesa\.so                                 u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/libminigbm_gralloc4_utils_gbm_mesa\.so                          u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/libui\.so                                                       u:object_r:same_process_hal_file:s0
 
 # Partitions
-/dev/block/mmcblk0p1                                                         u:object_r:boot_block_device:s0
-/dev/block/mmcblk0p2                                                         u:object_r:system_block_device:s0
-/dev/block/mmcblk0p3                                                         u:object_r:system_block_device:s0
-/dev/block/mmcblk0p4                                                         u:object_r:userdata_block_device:s0
+/dev/block/mmcblk0p1  u:object_r:boot_block_device:s0
+/dev/block/mmcblk0p2  u:object_r:system_block_device:s0
+/dev/block/mmcblk0p3  u:object_r:system_block_device:s0
+/dev/block/mmcblk0p4  u:object_r:userdata_block_device:s0
 
 # V4L2
-/vendor/bin/hw/android\.hardware\.media\.c2@1\.2-service-v4l2(.*)?           u:object_r:mediacodec_exec:s0
+/vendor/bin/hw/android\.hardware\.media\.c2@1\.2-service-v4l2(.*)?  u:object_r:mediacodec_exec:s0
diff --git a/sepolicy/service_contexts b/sepolicy/service_contexts
index 5962f1d..123bed2 100644
--- a/sepolicy/service_contexts
+++ b/sepolicy/service_contexts
@@ -1,3 +1,8 @@
-android.hardware.drm.IDrmFactory/widevine                                    u:object_r:hal_drm_service:s0
-android.hardware.security.sharedsecret.ISharedSecret/gatekeeper              u:object_r:hal_gatekeeper_service:s0
-mapper/minigbm_gbm_mesa                                                      u:object_r:hal_graphics_mapper_service:s0
+# DRM
+android.hardware.drm.IDrmFactory/widevine  u:object_r:hal_drm_service:s0
+
+# Gatekeeper
+android.hardware.security.sharedsecret.ISharedSecret/gatekeeper  u:object_r:hal_gatekeeper_service:s0
+
+# Graphics
+mapper/minigbm_gbm_mesa  u:object_r:hal_graphics_mapper_service:s0