Code Cleaning

Separate custom values from AOSP values