Settings: code cleanup

Change-Id: I34a328e9ff44950ac6c0241d48ab19052741243e