diff --git a/system.prop b/system.prop
index eac730a..ce4e176 100644
--- a/system.prop
+++ b/system.prop
@@ -1,4 +1,4 @@
-# Samsung specific
+### SAMSUNG SPECIFIC
 ro.product_ship=true
 # Set csc support in OMX
 # If not set or set to 0, OMX will only use BT.601 colorspace.
@@ -7,8 +7,14 @@
 ro.cmc.device_type=sd
 ro.cmc.version=2.0
 
-# camera
+### CAMERA
 ro.qq.camera.sensor=3
 
-# wifi direct
+### KEYSTORE
+ro.security.keystore.keytype=sak,gak
+
+### LOCKSCREEN
+lockscreen.rot_override=true
+
+### WIFI DIRECT
 wifi.direct.interface=p2p0
diff --git a/vendor.prop b/vendor.prop
index a59bff0..20187c4 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -10,10 +10,6 @@
 
 ### KEYSTORE
 ro.hardware.keystore=mdfpp
-ro.security.keystore.keytype=sak,gak
-
-### LOCKSCREEN
-lockscreen.rot_override=true
 
 ### OPENGLES
 ro.opengles.version=196610