Settings: code cleanup

Change-Id: I3a266eef09f2d30f200875fba67ff19e4aece2fa