Settings: code cleanup

Change-Id: Ic5f024ada76878865fc8f6432876075c4378e0a7