Settings: code cleanup

Change-Id: Icea1fd97f32f0038f369f9635422bbc06b3c62a3