Comment the PreferenceUtils class
Factorize a bit
Tweak utility classes.