diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index ae6179f..b6d9a13 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -1,2 +1 @@
-PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/device_m2note.mk
+PRODUCT_MAKEFILES := $(LOCAL_DIR)/device_m2note.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index bdafdae..a6435d8 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,10 +1,9 @@
-# boardconfig obviously
 DEVICE_PATH := device/meizu/m2note
 VENDOR_PATH := vendor/meizu/m2note
 
 TARGET_SPECIFIC_HEADER_PATH := $(DEVICE_PATH)/include
 
-# inherit from the proprietary version
+# Vendor
 -include $(VENDOR_PATH)/BoardConfigVendor.mk
 
 # Device cfg
diff --git a/device_m2note.mk b/device_m2note.mk
index d89e52c..8411feb 100644
--- a/device_m2note.mk
+++ b/device_m2note.mk
@@ -5,15 +5,15 @@ DEVICE_PATH := device/meizu/m2note
 
 DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/overlay
 
-# Device uses high-density artwork where available
+# Recovery allowed devices
+TARGET_OTA_ASSERT_DEVICE := m2note,m2n,meizu_m2_note
+
+# Device artwork density
 PRODUCT_AAPT_CONFIG := normal xhdpi
 PRODUCT_AAPT_PREF_CONFIG := xhdpi
 
 # Product fragments
 -include $(DEVICE_PATH)/product/*.mk
 
-# Recovery allowed devices
-TARGET_OTA_ASSERT_DEVICE := m2note,m2n,meizu_m2_note
-
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
diff --git a/lineage.mk b/lineage.mk
index d3ccde3..0a3af03 100644
--- a/lineage.mk
+++ b/lineage.mk
@@ -1,7 +1,9 @@
-
 # Release name
 PRODUCT_RELEASE_NAME := M2 Note
 
+# Sign the build with private certs
+PRODUCT_DEFAULT_DEV_CERTIFICATE := vendor/moyster/keys/releasekey
+
 # Inherit some common CM stuff.
 $(call inherit-product, vendor/cm/config/common_full_phone.mk)
 
@@ -23,6 +25,3 @@ PRODUCT_DEFAULT_LANGUAGE := en
 PRODUCT_DEFAULT_REGION   := US
 
 PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0
-
-# Sign the build with private certs
-PRODUCT_DEFAULT_DEV_CERTIFICATE := vendor/moyster/keys/releasekey
diff --git a/product/packages.mk b/product/packages.mk
index 7368948..092a069 100644
--- a/product/packages.mk
+++ b/product/packages.mk
@@ -36,9 +36,7 @@ PRODUCT_PACKAGES += \
     libtinycompress \
     libtinyxml
 
-# tinymix is an alsa plugin (breaks audio as of now)
-# PRODUCT_PACKAGES += \
-#     libtinymix
+#PRODUCT_PACKAGES += libtinymix
 
 # GPS
 PRODUCT_PACKAGES += \
diff --git a/recovery/etc/twrp.fstab b/recovery/etc/twrp.fstab
index 5eaab78..07d360f 100644
--- a/recovery/etc/twrp.fstab
+++ b/recovery/etc/twrp.fstab
@@ -12,4 +12,4 @@
 /data			ext4	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/userdata	flags=length=-16384;encryptable=/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/metadata;display="Data";backup=1
 /external_sd		auto	/dev/block/mmcblk1p1	/dev/block/mmcblk1	flags=display="External SDcard";storage;removable;backup=0
 /usbotg			auto	/dev/block/sda1	/dev/block/sda	flags=display="USB-OTG";storage;removable;backup=0
-/persistent			emmc	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/frp
+/persistent		emmc	/dev/block/platform/mtk-msdc.0/11230000.MSDC0/by-name/frp