Optimized PreferenceUtils
Refactoring